diff --git a/application/pom.xml b/application/pom.xml
index 28716d0823..a4602d4b5d 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -251,6 +251,11 @@
             <artifactId>spring-test-dbunit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>ru.yandex.qatools.embed</groupId>
+            <artifactId>postgresql-embedded</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java b/application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java
similarity index 97%
rename from application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java
rename to application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java
index af8b50fc48..680fa9492d 100644
--- a/application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java
@@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 /**
  * @author Andrew Shvayka
  */
-public class HttpDeviceApiTest extends AbstractControllerTest {
+public abstract class BaseHttpDeviceApiTest extends AbstractControllerTest {
 
     private static final AtomicInteger idSeq = new AtomicInteger(new Random(System.currentTimeMillis()).nextInt());
 
diff --git a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java
similarity index 96%
rename from application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java
rename to application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java
index fac12e76a0..54c3bc70fd 100644
--- a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java
+++ b/application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java
@@ -27,8 +27,8 @@ import java.util.Arrays;
  * @author Andrew Shvayka
  */
 @RunWith(ClasspathSuite.class)
-@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.*Test"})
-public class SystemTestSuite {
+@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.*NoSqlTest"})
+public class SystemNoSqlTestSuite {
 
     @ClassRule
     public static CustomCassandraCQLUnit cassandraUnit =
diff --git a/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java
new file mode 100644
index 0000000000..72982a863e
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java
@@ -0,0 +1,23 @@
+package org.thingsboard.server.system;
+
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.runner.RunWith;
+import org.thingsboard.server.dao.CustomPostgresUnit;
+
+import java.util.Arrays;
+
+/**
+ * Created by Valerii Sosliuk on 6/27/2017.
+ */
+@RunWith(ClasspathSuite.class)
+@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.sql.*SqlTest"})
+public class SystemSqlTestSuite {
+
+    @ClassRule
+    public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit(
+            Arrays.asList("postgres/schema.sql", "postgres/system-data.sql"),
+            "postgres-embedded-test.properties");
+
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java b/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java
new file mode 100644
index 0000000000..f8a172484d
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java
@@ -0,0 +1,12 @@
+package org.thingsboard.server.system.nosql;
+
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
+import org.thingsboard.server.dao.util.NoSqlDao;
+import org.thingsboard.server.system.BaseHttpDeviceApiTest;
+
+/**
+ * Created by Valerii Sosliuk on 6/27/2017.
+ */
+@DaoNoSqlTest
+public class DeviceApiNoSqlTest extends BaseHttpDeviceApiTest {
+}
diff --git a/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java
new file mode 100644
index 0000000000..2df56e8268
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java
@@ -0,0 +1,11 @@
+package org.thingsboard.server.system.sql;
+
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.system.BaseHttpDeviceApiTest;
+
+/**
+ * Created by Valerii Sosliuk on 6/27/2017.
+ */
+@DaoSqlTest
+public class DeviceApiSqlTest extends BaseHttpDeviceApiTest{
+}
diff --git a/dao/pom.xml b/dao/pom.xml
index 7686f10033..2bb77511bb 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -169,11 +169,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.embed</groupId>
             <artifactId>postgresql-embedded</artifactId>
diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
index 42823a1e68..3392ef7f3c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
@@ -30,7 +30,9 @@ public abstract class DaoUtil {
         if (toDataList != null && !toDataList.isEmpty()) {
             list = new ArrayList<>();
             for (ToData<T> object : toDataList) {
-                list.add(object.toData());
+                if (object != null) {
+                    list.add(object.toData());
+                }
             }
         }
         return list;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java
similarity index 96%
rename from dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java
rename to dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java
index 6d16d1b6af..e369bb42ff 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java
@@ -24,5 +24,5 @@ import java.lang.annotation.*;
 @Inherited
 @Documented
 @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties", "classpath:nosql-test.properties"})
-public @interface DaoServiceNoSqlTest {
+public @interface DaoNoSqlTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java
similarity index 96%
rename from dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java
rename to dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java
index 4ad7bdabce..4034235f22 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java
@@ -24,5 +24,5 @@ import java.lang.annotation.*;
 @Inherited
 @Documented
 @TestPropertySource(locations = {"classpath:application-test.properties", "classpath:sql-test.properties"})
-public @interface DaoServiceSqlTest {
+public @interface DaoSqlTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java
index 2a2d57a444..295b888100 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.attributes.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AttributesServiceNoSqlTest extends BaseAttributesServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java
index 9cedb3a431..7c06da09a3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.attributes.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AttributesServiceSqlTest extends BaseAttributesServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java
index 36a87096e9..21f81fe2cd 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.event.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.event.BaseEventServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class EventServiceNoSqlTest extends BaseEventServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java
index a0d63699d9..77fee52372 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.event.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.event.BaseEventServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class EventServiceSqlTest extends BaseEventServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java
index 8f1dc1f600..b02c9cba6d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AdminSettingsServiceNoSqlTest extends BaseAdminSettingsServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java
index 5444dda2a9..9115a2daa1 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseAlarmServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AlarmServiceNoSqlTest extends BaseAlarmServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java
index 9a426d227a..6370a711f8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseAssetServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class AssetServiceNoSqlTest extends BaseAssetServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java
index 0981463813..f437551843 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseCustomerServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class CustomerServiceNoSqlTest extends BaseCustomerServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java
index b5972194cc..2ed8f554e2 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDashboardServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DashboardServiceNoSqlTest extends BaseDashboardServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java
index 8cebc1b549..3dc4b84623 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java
index b0dcd10801..0a85622014 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DeviceCredentialServiceNoSqlTest extends BaseDeviceCredentialsServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java
index bffbc67e0f..a6f9554dc2 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class DeviceServiceNoSqlTest extends BaseDeviceServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java
index 3f39797215..2133304a32 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseRelationServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class RelationServiceNoSqlTest extends BaseRelationServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java
index f977ee41b8..8066e57fdc 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseTenantServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class TenantServiceNoSqlTest extends BaseTenantServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java
index 4fe536ccae..d3a64524cf 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseUserServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class UserServiceNoSqlTest extends BaseUserServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java
index d959184eb1..a814f359ca 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class WidgetTypeServiceNoSqlTest extends BaseWidgetTypeServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java
index 498a96efd3..b0e7890310 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class WidgetsBundleServiceNoSqlTest extends BaseWidgetsBundleServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java
index 15b6ddaed2..f06e5435bc 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.plugin.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class PluginServiceNoSqlTest extends BasePluginServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java
index addeffe64e..448747f36e 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.plugin.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class PluginServiceSqlTest extends BasePluginServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java
index 1fc6886cd9..2a347832c4 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.rule.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class RuleServiceNoSqlTest extends BaseRuleServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java
index b3a810f068..1e9325a9a7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.rule.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class RuleServiceSqlTest extends BaseRuleServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java
index 901a9cf6e6..ff66d126b5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java
index 85bef2bbaa..f67f5d568d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseAlarmServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AlarmServiceSqlTest extends BaseAlarmServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java
index 30cc8feec1..1bbc789ee6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseAssetServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class AssetServiceSqlTest extends BaseAssetServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java
index 559281b239..bdaca55109 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseCustomerServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class CustomerServiceSqlTest extends BaseCustomerServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java
index 5af38f62c0..77a8cef932 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDashboardServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DashboardServiceSqlTest extends BaseDashboardServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java
index b6fd8e802c..6f9211d8ee 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java
index fbc0cd6b37..31fde40b79 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java
index 4a030d508a..647a6027a0 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseDeviceServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class DeviceServiceSqlTest extends BaseDeviceServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java
index 8c8e178c68..e9fefa4cd2 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseRelationServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class RelationServiceSqlTest extends BaseRelationServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java
index 6f05d5379b..f2816dae9c 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseTenantServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class TenantServiceSqlTest extends BaseTenantServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java
index 27c69998fd..4b4085722c 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseUserServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class UserServiceSqlTest extends BaseUserServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java
index 5c9656fdd1..ec733d69f3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java
index 3e6dcdedad..7d44fa8ef2 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java
index 56b1b47781..a5c29aadfa 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.timeseries.nosql;
 
-import org.thingsboard.server.dao.service.DaoServiceNoSqlTest;
+import org.thingsboard.server.dao.service.DaoNoSqlTest;
 import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;
 
-@DaoServiceNoSqlTest
+@DaoNoSqlTest
 public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest {
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java
index 5e92e55217..fa13dea926 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java
@@ -15,9 +15,9 @@
  */
 package org.thingsboard.server.dao.service.timeseries.sql;
 
-import org.thingsboard.server.dao.service.DaoServiceSqlTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;
 
-@DaoServiceSqlTest
+@DaoSqlTest
 public class TimeseriesServiceSqlTest extends BaseTimeseriesServiceTest {
 }
diff --git a/pom.xml b/pom.xml
index 393fbbaea4..5c16cb60de 100755
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,6 @@
         <springfox-swagger.version>2.6.1</springfox-swagger.version>
         <bouncycastle.version>1.56</bouncycastle.version>
         <winsw.version>2.0.1</winsw.version>
-        <h2.version>1.4.194</h2.version>
         <dbunit.version>2.5.3</dbunit.version>
         <spring-test-dbunit.version>1.2.1</spring-test-dbunit.version>
         <postgresql.driver.version>9.4.1211</postgresql.driver.version>
@@ -741,12 +740,6 @@
                 <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>ru.yandex.qatools.embed</groupId>
                 <artifactId>postgresql-embedded</artifactId>