diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index e41cbfbdf1..e2b7d700bd 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -375,7 +375,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     }
 
     protected void login(String username, String password) throws Exception {
-        logout();
+        resetTokens();
         JsonNode tokenInfo = readResponse(doPost("/api/auth/login", new LoginRequest(username, password)).andExpect(status().isOk()), JsonNode.class);
         validateAndSetJwtToken(tokenInfo, username);
     }
diff --git a/application/src/test/java/org/thingsboard/server/system/BaseRestApiLimitsTest.java b/application/src/test/java/org/thingsboard/server/system/BaseRestApiLimitsTest.java
index 61e2036b12..2f7efae923 100644
--- a/application/src/test/java/org/thingsboard/server/system/BaseRestApiLimitsTest.java
+++ b/application/src/test/java/org/thingsboard/server/system/BaseRestApiLimitsTest.java
@@ -63,15 +63,15 @@ public abstract class BaseRestApiLimitsTest extends AbstractControllerTest {
     public void before() throws Exception {
         loginSysAdmin();
         tenantProfile = getDefaultTenantProfile();
-        logout();
+        resetTokens();
     }
 
     @After
     public void after() throws Exception {
-        logout();
+        resetTokens();
         loginSysAdmin();
         saveTenantProfileWitConfiguration(tenantProfile, new DefaultTenantProfileConfiguration());
-        logout();
+        resetTokens();
         service.shutdown();
     }
 
@@ -85,7 +85,7 @@ public abstract class BaseRestApiLimitsTest extends AbstractControllerTest {
 
         saveTenantProfileWitConfiguration(tenantProfile, configurationWithCustomerRestLimits);
 
-        logout();
+        resetTokens();
 
         loginCustomerUser();
 
@@ -105,7 +105,7 @@ public abstract class BaseRestApiLimitsTest extends AbstractControllerTest {
 
         saveTenantProfileWitConfiguration(tenantProfile, configurationWithTenantRestLimits);
 
-        logout();
+        resetTokens();
 
         loginCustomerUser();
 
@@ -125,7 +125,7 @@ public abstract class BaseRestApiLimitsTest extends AbstractControllerTest {
 
         saveTenantProfileWitConfiguration(tenantProfile, configurationWithTenantRestLimits);
 
-        logout();
+        resetTokens();
 
         loginTenantAdmin();