diff --git a/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java b/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java
index 491e642..9649ad8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/CustomSqlUnit.java
@@ -58,6 +58,8 @@ public class CustomSqlUnit extends ExternalResource {
@Override
public void before() {
+ cleanUpDb();
+
Connection conn = null;
try {
conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
@@ -81,6 +83,10 @@ public class CustomSqlUnit extends ExternalResource {
@Override
public void after() {
+ cleanUpDb();
+ }
+
+ private void cleanUpDb() {
Connection conn = null;
try {
conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
diff --git a/dao/src/test/resources/sql-test.properties b/dao/src/test/resources/sql-test.properties
index be6d353..0bcc789 100644
--- a/dao/src/test/resources/sql-test.properties
+++ b/dao/src/test/resources/sql-test.properties
@@ -1,4 +1,4 @@
-database.type=sql
+ database.type=sql
spring.jpa.show-sql=false
spring.jpa.hibernate.ddl-auto=validate
@@ -6,5 +6,5 @@ spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect
spring.datasource.username=sa
spring.datasource.password=
-spring.datasource.url=jdbc:hsqldb:mem:testDb;sql.enforce_size=false
+spring.datasource.url=jdbc:hsqldb:file:/tmp/testDb;sql.enforce_size=false
spring.datasource.driverClassName=org.hsqldb.jdbc.JDBCDriver
\ No newline at end of file
