diff --git a/src/test/isolation2/input/pg_basebackup_with_tablespaces.source b/src/test/isolation2/input/pg_basebackup_with_tablespaces.source
index d4fc7ed8fc7080b1153971beba41b0859812c3a6..2311130720b06c9f086b29eb82a3cddc8f193a76 100644
--- a/src/test/isolation2/input/pg_basebackup_with_tablespaces.source
+++ b/src/test/isolation2/input/pg_basebackup_with_tablespaces.source
@@ -25,6 +25,8 @@ select count_of_items_in_directory('@testtablespace@/some_isolation2_pg_baseback
 
 -- Cleanup things we've created
 0U: select pg_drop_replication_slot('some_replication_slot');
+drop database some_database_with_tablespace;
+drop tablespace some_isolation2_pg_basebackup_tablespace;
 !\retcode rm -rf @testtablespace@/some_isolation2_pg_basebackup;
 !\retcode rm -rf @testtablespace@/some_isolation2_pg_basebackup_tablespace;
 
diff --git a/src/test/isolation2/output/pg_basebackup_with_tablespaces.source b/src/test/isolation2/output/pg_basebackup_with_tablespaces.source
index a30bd1d9671b1529451e68a8f14329691da9892b..c9c7573e4a29a2e7acfc015505d1439c7d1c67b8 100644
--- a/src/test/isolation2/output/pg_basebackup_with_tablespaces.source
+++ b/src/test/isolation2/output/pg_basebackup_with_tablespaces.source
@@ -54,6 +54,10 @@ select count_of_items_in_directory('@testtablespace@/some_isolation2_pg_baseback
 --------------------------
                           
 (1 row)
+drop database some_database_with_tablespace;
+DROP
+drop tablespace some_isolation2_pg_basebackup_tablespace;
+DROP
 !\retcode rm -rf @testtablespace@/some_isolation2_pg_basebackup;
 -- start_ignore