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 ff079fc731..a3b144f4a9 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -420,7 +420,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     }
 
     protected void logout() throws Exception {
-        doPost("/api/auth/logout");
+        doPost("/api/auth/logout").andExpect(status().isOk());
     }
 
     protected void setJwtToken(MockHttpServletRequestBuilder request) {
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java
index 61945e59bb..627ce1a02b 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java
@@ -15,13 +15,15 @@
  */
 package org.thingsboard.server.controller;
 
+import org.junit.Test;
+import org.thingsboard.server.common.data.security.Authority;
+
+import java.util.concurrent.TimeUnit;
+
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.thingsboard.server.common.data.security.Authority;
-import org.junit.Test;
-
 public abstract class BaseAuthControllerTest extends AbstractControllerTest {
 
     @Test
@@ -57,6 +59,8 @@ public abstract class BaseAuthControllerTest extends AbstractControllerTest {
         .andExpect(jsonPath("$.authority",is(Authority.SYS_ADMIN.name())))
         .andExpect(jsonPath("$.email",is(SYS_ADMIN_EMAIL)));
 
+        TimeUnit.SECONDS.sleep(1); //We need to make sure that event for invalidating token was successfully processed
+
         logout();
         doGet("/api/auth/user")
         .andExpect(status().isUnauthorized());