diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java
index cc50cdd00d..246749881f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java
@@ -696,7 +696,9 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
         Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent());
 
         edgeImitator.allowIgnoredTypes();
-        edgeImitator.disconnect();
+        try {
+            edgeImitator.disconnect();
+        } catch (Exception ignored) {}
 
         doDelete("/api/device/" + savedDevice.getId().getId().toString())
                 .andExpect(status().isOk());
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java
index f7ed71f177..c07a499f83 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java
@@ -103,7 +103,7 @@ public class BaseEdgeEventControllerTest extends AbstractControllerTest {
                             new TypeReference<PageData<EdgeEvent>>() {}, new TimePageLink(4)).getData();
             attempt++;
             Thread.sleep(100);
-        } while (edgeEvents.size() != 4 || attempt < 5);
+        } while (edgeEvents.size() != 4 && attempt < 5);
         Assert.assertEquals(4, edgeEvents.size());
         Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.RULE_CHAIN.equals(ee.getType())));
         Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.DEVICE.equals(ee.getType())));
diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
index 2d38fa9299..92548bb621 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
@@ -178,7 +178,9 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
 
     @After
     public void afterTest() throws Exception {
-        edgeImitator.disconnect();
+        try {
+            edgeImitator.disconnect();
+        } catch (Exception ignored) {}
 
         loginSysAdmin();