diff --git a/tsl/test/expected/compression_bgw.out b/tsl/test/expected/compression_bgw.out
index 09febc592..d14bc7f0d 100644
--- a/tsl/test/expected/compression_bgw.out
+++ b/tsl/test/expected/compression_bgw.out
@@ -272,6 +272,7 @@ ALTER TABLE test_table_nologin set (timescaledb.compress);
 SELECT add_compression_policy('test_table_nologin', 2::int);
 ERROR:  permission denied to start background process as role "nologin_role"
 \set ON_ERROR_STOP 1
+DROP TABLE test_table_nologin;
 RESET ROLE;
 REVOKE NOLOGIN_ROLE FROM :ROLE_DEFAULT_PERM_USER;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
@@ -651,3 +652,7 @@ SELECT delete_job(:JOB_RECOMPRESS);
  
 (1 row)
 
+-- Teardown test
+\c :TEST_DBNAME :ROLE_SUPERUSER
+REVOKE CREATE ON SCHEMA public FROM NOLOGIN_ROLE;
+DROP ROLE NOLOGIN_ROLE;
diff --git a/tsl/test/sql/compression_bgw.sql b/tsl/test/sql/compression_bgw.sql
index ce7b0c6f1..6abe20cd1 100644
--- a/tsl/test/sql/compression_bgw.sql
+++ b/tsl/test/sql/compression_bgw.sql
@@ -159,6 +159,7 @@ ALTER TABLE test_table_nologin set (timescaledb.compress);
 \set ON_ERROR_STOP 0
 SELECT add_compression_policy('test_table_nologin', 2::int);
 \set ON_ERROR_STOP 1
+DROP TABLE test_table_nologin;
 RESET ROLE;
 REVOKE NOLOGIN_ROLE FROM :ROLE_DEFAULT_PERM_USER;
 
@@ -217,3 +218,8 @@ SELECT count(*) FROM timescaledb_information.chunks
 WHERE hypertable_name = 'conditions' and is_compressed = true;
 
 \i include/recompress_basic.sql
+
+-- Teardown test
+\c :TEST_DBNAME :ROLE_SUPERUSER
+REVOKE CREATE ON SCHEMA public FROM NOLOGIN_ROLE;
+DROP ROLE NOLOGIN_ROLE;