diff --git a/src/test/regress/expected/other_databases.out b/src/test/regress/expected/other_databases.out
index b1460b41c..67d7dad3f 100644
--- a/src/test/regress/expected/other_databases.out
+++ b/src/test/regress/expected/other_databases.out
@@ -123,5 +123,8 @@ SELECT usename FROM pg_user WHERE usename LIKE 'worker\_user%' ORDER BY 1;
 -- some user creation commands will fail but let's make sure we try to drop them just in case
 DROP USER IF EXISTS worker_user1, worker_user2, worker_user3;
 NOTICE:  role "worker_user3" does not exist, skipping
+\c - - - :worker_1_port
+DROP DATABASE other_db2;
+\c - - - :master_port
 DROP SCHEMA other_databases;
 DROP DATABASE other_db1;
diff --git a/src/test/regress/sql/other_databases.sql b/src/test/regress/sql/other_databases.sql
index a216ee861..629f74f45 100644
--- a/src/test/regress/sql/other_databases.sql
+++ b/src/test/regress/sql/other_databases.sql
@@ -90,5 +90,9 @@ SELECT usename FROM pg_user WHERE usename LIKE 'worker\_user%' ORDER BY 1;
 -- some user creation commands will fail but let's make sure we try to drop them just in case
 DROP USER IF EXISTS worker_user1, worker_user2, worker_user3;
 
+\c - - - :worker_1_port
+DROP DATABASE other_db2;
+\c - - - :master_port
+
 DROP SCHEMA other_databases;
 DROP DATABASE other_db1;