diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
index 487d07d188..152335c807 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
@@ -817,9 +817,8 @@ private List<EntityViewInfo> loadListOfInfo(PageLink pageLink, String urlTemplat
         return loadedItems;
     }
 
-    // edge-only: @Ignore - edge entities support available for CE/PE
-    @Ignore
     @Test
+    @Ignore("Edge entities support available for CE/PE only")
     public void testAssignEntityViewToEdge() throws Exception {
         Edge edge = constructEdge("My edge", "default");
         Edge savedEdge = doPost("/api/edge", edge, Edge.class);
diff --git a/application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java
index bee0e3392d..e625ce04a3 100644
--- a/application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java
@@ -17,6 +17,7 @@
 
 import com.google.protobuf.AbstractMessage;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java
index 90510cf2b7..10889589ff 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java
@@ -21,6 +21,7 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
@@ -110,6 +111,7 @@ public void testSaveDeviceName0x00_thenSomeDatabaseException() {
     }
 
     @Test
+    @Ignore("HasVersion check is ignored for Edge")
     public void testSaveDevice_versionIncrement() {
         Device device = getDevice(tenantId1, customerId1, "1ewfewf2");
         device = saveDevice(tenantId1, device);
@@ -126,6 +128,7 @@ public void testSaveDevice_versionIncrement() {
     }
 
     @Test
+    @Ignore("HasVersion check is ignored for Edge")
     public void testSaveDevice_versionIncrement_noChanges() {
         Device device = getDevice(tenantId1, customerId1, "1ewfewf2");
         device = saveDevice(tenantId1, device);