diff --git a/dao/pom.xml b/dao/pom.xml
index f490a0e8e5..b8be6e3439 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -256,7 +256,7 @@
                 <configuration>
                     <excludes>
                         <exclude>**/sql/*Test.java</exclude>
-                        <exclude>**/sql/*/*Test.java</exclude>
+                        <exclude>**/sql/*/*DaoTest.java</exclude>
                         <exclude>**/psql/*Test.java</exclude>
                         <exclude>**/nosql/*Test.java</exclude>
                     </excludes>
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java
index abbcb61d3b..ede58da57d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java
@@ -15,14 +15,14 @@
  */
 package org.thingsboard.server.dao.sql.query;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class EntityDataAdapterTest {
+public class EntityDataAdapterTest {
 
     @Test
-    void testConvertValue() {
+    public void testConvertValue() {
         assertThat(EntityDataAdapter.convertValue("500")).isEqualTo("500");
         assertThat(EntityDataAdapter.convertValue("500D")).isEqualTo("500D"); //do not convert to Double !!!
     }