diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
index 1a1b4737ef..dfa5c77bff 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
         "org.thingsboard.server.dao.sql.dashboard.*Test",
         "org.thingsboard.server.dao.sql.query.*Test",
         "org.thingsboard.server.dao.sql.device.*Test",
-        "org.thingsboard.server.dao.sql.widget.*JpaWidgetsBundleDaoTest",
+        "org.thingsboard.server.dao.sql.widget.*Test",
         "org.thingsboard.server.dao.sql.event.*Test",
         "org.thingsboard.server.dao.sql.user.*JpaUserCredentialsDaoTest"
 })
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java
index 9442a2b4ea..1dcc8f0bbe 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java
@@ -15,40 +15,69 @@
  */
 package org.thingsboard.server.dao.sql.widget;
 
-import com.github.springtestdbunit.annotation.DatabaseSetup;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.dao.AbstractJpaDaoTest;
 import org.thingsboard.server.dao.widget.WidgetTypeDao;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Created by Valerii Sosliuk on 4/30/2017.
  */
 public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
 
+    final String BUNDLE_ALIAS = "BUNDLE_ALIAS";
+    final int WIDGET_TYPE_COUNT = 3;
+    List<WidgetType> widgetTypeList;
+
     @Autowired
     private WidgetTypeDao widgetTypeDao;
 
+    @Before
+    public void setUp() {
+        widgetTypeList = new ArrayList<>();
+        for (int i = 0; i < WIDGET_TYPE_COUNT; i++) {
+            widgetTypeList.add(createAndSaveWidgetType(i));
+        }
+    }
+
+    WidgetType createAndSaveWidgetType(int number) {
+        WidgetTypeDetails widgetType = new WidgetTypeDetails();
+        widgetType.setTenantId(TenantId.SYS_TENANT_ID);
+        widgetType.setName("WIDGET_TYPE_" + number);
+        widgetType.setAlias("ALIAS_" + number);
+        widgetType.setBundleAlias(BUNDLE_ALIAS);
+        return widgetTypeDao.save(TenantId.SYS_TENANT_ID, widgetType);
+    }
+
+    @After
+    public void deleteAllWidgetType() {
+        for (WidgetType widgetType : widgetTypeList) {
+            widgetTypeDao.removeById(TenantId.SYS_TENANT_ID, widgetType.getUuidId());
+        }
+    }
+
     @Test
-    @DatabaseSetup(("classpath:dbunit/widget_type.xml"))
     public void testFindByTenantIdAndBundleAlias() {
-        UUID tenantId = UUID.fromString("2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833");
-        List<WidgetType> widgetTypes = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId, "BUNDLE_ALIAS_1");
-        assertEquals(3, widgetTypes.size());
+        List<WidgetType> widgetTypes = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(TenantId.SYS_TENANT_ID.getId(), BUNDLE_ALIAS);
+        assertEquals(WIDGET_TYPE_COUNT, widgetTypes.size());
     }
 
     @Test
-    @DatabaseSetup(("classpath:dbunit/widget_type.xml"))
     public void testFindByTenantIdAndBundleAliasAndAlias() {
-        UUID tenantId = UUID.fromString("2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833");
-        WidgetType widgetType = widgetTypeDao.findByTenantIdBundleAliasAndAlias(tenantId, "BUNDLE_ALIAS_1", "ALIAS3");
-        UUID id = UUID.fromString("2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833");
-        assertEquals(id, widgetType.getId().getId());
+        WidgetType result = widgetTypeList.get(0);
+        assertNotNull(result);
+        WidgetType widgetType = widgetTypeDao.findByTenantIdBundleAliasAndAlias(TenantId.SYS_TENANT_ID.getId(), BUNDLE_ALIAS, "ALIAS_0");
+        assertEquals(result.getId(), widgetType.getId());
     }
 }