diff --git a/citus-tools b/citus-tools
deleted file mode 160000
index 3376bd6845f..00000000000
--- a/citus-tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf
diff --git a/src/test/regress/expected/pg17.out b/src/test/regress/expected/pg17.out
index 5e4460be1ce..c6deb41aaa8 100644
--- a/src/test/regress/expected/pg17.out
+++ b/src/test/regress/expected/pg17.out
@@ -2718,10 +2718,7 @@ USING pg_catalog.pg_class AS ref_0
 ON target_0.id = ref_0.relpages
 WHEN NOT MATCHED THEN DO NOTHING;
 ERROR:  MERGE INTO an distributed table from Postgres table is not yet supported
--- Step 5: Cleanup
-DROP TABLE non_dist_table_12345;
-ERROR:  table "non_dist_table_12345" does not exist
-DROP TABLE dist_table_67890 CASCADE;
+\c - - - :master_port
 -- End of Issue #7846
 \set VERBOSITY terse
 SET client_min_messages TO WARNING;
diff --git a/src/test/regress/sql/pg17.sql b/src/test/regress/sql/pg17.sql
index ef73715514c..f55d50d172a 100644
--- a/src/test/regress/sql/pg17.sql
+++ b/src/test/regress/sql/pg17.sql
@@ -1479,10 +1479,7 @@ USING pg_catalog.pg_class AS ref_0
 ON target_0.id = ref_0.relpages
 WHEN NOT MATCHED THEN DO NOTHING;
 
--- Step 5: Cleanup
-DROP TABLE non_dist_table_12345;
-DROP TABLE dist_table_67890 CASCADE;
-
+\c - - - :master_port
 -- End of Issue #7846
 
 \set VERBOSITY terse