diff --git a/dao/src/test/java/org/thingsboard/server/dao/TimescaleSqlInitializer.java b/dao/src/test/java/org/thingsboard/server/dao/TimescaleSqlInitializer.java
index 7ed0c811b2..8b4b650766 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/TimescaleSqlInitializer.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/TimescaleSqlInitializer.java
@@ -36,7 +36,7 @@ public class TimescaleSqlInitializer {
             "sql/schema-views-and-functions.sql",
             "sql/system-data.sql",
             "sql/system-test-psql.sql");
-    private static final String dropAllTablesSqlFile = "sql/timescale/drop-all-tables.sql";
+    private static final String dropAllTablesSqlFile = "sql/psql/drop-all-tables.sql";
 
     public static void initDb(Connection conn) {
         cleanUpDb(conn);
diff --git a/dao/src/test/resources/sql/hsql/drop-all-tables.sql b/dao/src/test/resources/sql/hsql/drop-all-tables.sql
deleted file mode 100644
index 3ad3dac3b3..0000000000
--- a/dao/src/test/resources/sql/hsql/drop-all-tables.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-DROP TABLE IF EXISTS admin_settings;
-DROP TABLE IF EXISTS entity_alarm;
-DROP TABLE IF EXISTS alarm;
-DROP TABLE IF EXISTS asset;
-DROP TABLE IF EXISTS audit_log;
-DROP TABLE IF EXISTS attribute_kv;
-DROP TABLE IF EXISTS component_descriptor;
-DROP TABLE IF EXISTS customer;
-DROP TABLE IF EXISTS device;
-DROP TABLE IF EXISTS device_credentials;
-DROP TABLE IF EXISTS event;
-DROP TABLE IF EXISTS relation;
-DROP TABLE IF EXISTS tb_user;
-DROP TABLE IF EXISTS tenant;
-DROP TABLE IF EXISTS ts_kv;
-DROP TABLE IF EXISTS ts_kv_dictionary;
-DROP TABLE IF EXISTS ts_kv_latest;
-DROP TABLE IF EXISTS user_credentials;
-DROP TABLE IF EXISTS widget_type;
-DROP TABLE IF EXISTS widgets_bundle;
-DROP TABLE IF EXISTS entity_view;
-DROP TABLE IF EXISTS device_profile;
-DROP TABLE IF EXISTS tenant_profile;
-DROP TABLE IF EXISTS dashboard;
-DROP TABLE IF EXISTS rule_node_state;
-DROP TABLE IF EXISTS rule_node;
-DROP TABLE IF EXISTS rule_chain;
-DROP TABLE IF EXISTS oauth2_mobile;
-DROP TABLE IF EXISTS oauth2_domain;
-DROP TABLE IF EXISTS oauth2_registration;
-DROP TABLE IF EXISTS oauth2_params;
-DROP TABLE IF EXISTS oauth2_client_registration_template;
-DROP TABLE IF EXISTS oauth2_client_registration;
-DROP TABLE IF EXISTS oauth2_client_registration_info;
-DROP TABLE IF EXISTS api_usage_state;
-DROP TABLE IF EXISTS resource;
-DROP TABLE IF EXISTS ota_package;
-DROP TABLE IF EXISTS edge;
-DROP TABLE IF EXISTS edge_event;
-DROP TABLE IF EXISTS rpc;
-DROP TABLE IF EXISTS queue;
-DROP FUNCTION IF EXISTS to_uuid;
diff --git a/dao/src/test/resources/sql/psql/drop-all-tables.sql b/dao/src/test/resources/sql/psql/drop-all-tables.sql
index 2116bc367d..2fca79e01e 100644
--- a/dao/src/test/resources/sql/psql/drop-all-tables.sql
+++ b/dao/src/test/resources/sql/psql/drop-all-tables.sql
@@ -1,5 +1,23 @@
+DROP FUNCTION IF EXISTS to_uuid;
+DROP FUNCTION IF EXISTS create_or_update_active_alarm;
+DROP FUNCTION IF EXISTS update_alarm;
+DROP FUNCTION IF EXISTS acknowledge_alarm;
+DROP FUNCTION IF EXISTS clear_alarm;
+DROP FUNCTION IF EXISTS assign_alarm;
+DROP FUNCTION IF EXISTS unassign_alarm;
+
+DROP PROCEDURE IF EXISTS cleanup_edge_events_by_ttl;
+DROP PROCEDURE IF EXISTS cleanup_timeseries_by_ttl;
+DROP FUNCTION IF EXISTS delete_customer_records_from_ts_kv;
+
+DROP VIEW IF EXISTS device_info_active_attribute_view CASCADE;
+DROP VIEW IF EXISTS device_info_active_ts_view CASCADE;
+DROP VIEW IF EXISTS device_info_view CASCADE;
+DROP VIEW IF EXISTS alarm_info CASCADE;
+
 DROP TABLE IF EXISTS admin_settings;
 DROP TABLE IF EXISTS entity_alarm;
+DROP TABLE IF EXISTS alarm_comment;
 DROP TABLE IF EXISTS alarm;
 DROP TABLE IF EXISTS asset;
 DROP TABLE IF EXISTS audit_log;
@@ -8,9 +26,12 @@ DROP TABLE IF EXISTS component_descriptor;
 DROP TABLE IF EXISTS customer;
 DROP TABLE IF EXISTS device;
 DROP TABLE IF EXISTS device_credentials;
-DROP TABLE IF EXISTS event;
+DROP TABLE IF EXISTS rule_node_debug_event;
+DROP TABLE IF EXISTS rule_chain_debug_event;
+DROP TABLE IF EXISTS stats_event;
+DROP TABLE IF EXISTS lc_event;
+DROP TABLE IF EXISTS error_event;
 DROP TABLE IF EXISTS relation;
-DROP TABLE IF EXISTS tb_user;
 DROP TABLE IF EXISTS tenant;
 DROP TABLE IF EXISTS ts_kv;
 DROP TABLE IF EXISTS ts_kv_latest;
@@ -31,13 +52,22 @@ DROP TABLE IF EXISTS oauth2_mobile;
 DROP TABLE IF EXISTS oauth2_domain;
 DROP TABLE IF EXISTS oauth2_registration;
 DROP TABLE IF EXISTS oauth2_params;
-DROP TABLE IF EXISTS oauth2_client_registration_template;
 DROP TABLE IF EXISTS oauth2_client_registration;
 DROP TABLE IF EXISTS oauth2_client_registration_info;
+DROP TABLE IF EXISTS oauth2_client_registration_template;
+DROP TABLE IF EXISTS ota_package;
 DROP TABLE IF EXISTS api_usage_state;
 DROP TABLE IF EXISTS resource;
 DROP TABLE IF EXISTS firmware;
 DROP TABLE IF EXISTS edge;
 DROP TABLE IF EXISTS edge_event;
 DROP TABLE IF EXISTS rpc;
-DROP TABLE IF EXISTS queue;
\ No newline at end of file
+DROP TABLE IF EXISTS queue;
+DROP TABLE IF EXISTS notification;
+DROP TABLE IF EXISTS notification_request;
+DROP TABLE IF EXISTS notification_rule;
+DROP TABLE IF EXISTS notification_template;
+DROP TABLE IF EXISTS notification_target;
+DROP TABLE IF EXISTS user_settings;
+DROP TABLE IF EXISTS user_auth_settings;
+DROP TABLE IF EXISTS tb_user;
\ No newline at end of file
diff --git a/dao/src/test/resources/sql/system-test-psql.sql b/dao/src/test/resources/sql/system-test-psql.sql
index 8d3f08a32f..172731b9c5 100644
--- a/dao/src/test/resources/sql/system-test-psql.sql
+++ b/dao/src/test/resources/sql/system-test-psql.sql
@@ -1,2 +1,2 @@
 --PostgreSQL specific truncate to fit constraints
-TRUNCATE TABLE device_credentials, device, device_profile, asset, asset_profile, ota_package, rule_node_state, rule_node, rule_chain;
\ No newline at end of file
+TRUNCATE TABLE device_credentials, device, device_profile, asset, asset_profile, ota_package, rule_node_state, rule_node, rule_chain, alarm_comment, alarm, entity_alarm;
\ No newline at end of file
diff --git a/dao/src/test/resources/sql/timescale/drop-all-tables.sql b/dao/src/test/resources/sql/timescale/drop-all-tables.sql
deleted file mode 100644
index 80330a5ef5..0000000000
--- a/dao/src/test/resources/sql/timescale/drop-all-tables.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-DROP TABLE IF EXISTS admin_settings;
-DROP TABLE IF EXISTS entity_alarm;
-DROP TABLE IF EXISTS alarm;
-DROP TABLE IF EXISTS asset;
-DROP TABLE IF EXISTS audit_log;
-DROP TABLE IF EXISTS attribute_kv;
-DROP TABLE IF EXISTS component_descriptor;
-DROP TABLE IF EXISTS customer;
-DROP TABLE IF EXISTS device;
-DROP TABLE IF EXISTS device_credentials;
-DROP TABLE IF EXISTS event;
-DROP TABLE IF EXISTS relation;
-DROP TABLE IF EXISTS tb_user;
-DROP TABLE IF EXISTS tenant;
-DROP TABLE IF EXISTS ts_kv;
-DROP TABLE IF EXISTS ts_kv_latest;
-DROP TABLE IF EXISTS ts_kv_dictionary;
-DROP TABLE IF EXISTS user_credentials;
-DROP TABLE IF EXISTS widget_type;
-DROP TABLE IF EXISTS widgets_bundle;
-DROP TABLE IF EXISTS rule_node_state;
-DROP TABLE IF EXISTS rule_node;
-DROP TABLE IF EXISTS rule_chain;
-DROP TABLE IF EXISTS entity_view;
-DROP TABLE IF EXISTS device_profile;
-DROP TABLE IF EXISTS tenant_profile;
-DROP TABLE IF EXISTS asset_profile;
-DROP TABLE IF EXISTS dashboard;
-DROP TABLE IF EXISTS edge;
-DROP TABLE IF EXISTS edge_event;
-DROP TABLE IF EXISTS tb_schema_settings;
-DROP TABLE IF EXISTS oauth2_client_registration;
-DROP TABLE IF EXISTS oauth2_client_registration_info;
-DROP TABLE IF EXISTS oauth2_client_registration_template;
-DROP TABLE IF EXISTS api_usage_state;
-DROP TABLE IF EXISTS resource;
-DROP TABLE IF EXISTS firmware;
-DROP TABLE IF EXISTS queue;