diff --git a/src/test/regress/expected/pg17.out b/src/test/regress/expected/pg17.out
index 5e4460be1ce..53837aae122 100644
--- a/src/test/regress/expected/pg17.out
+++ b/src/test/regress/expected/pg17.out
@@ -2701,6 +2701,7 @@ MERGE INTO non_dist_table_12345 AS target_0
 USING pg_catalog.pg_class AS ref_0
 ON target_0.id = ref_0.relpages
 WHEN NOT MATCHED THEN DO NOTHING;
+DROP TABLE non_dist_table_12345;
 -- Step 3: Switch back to the coordinator for distributed table operations
 \c postgresql://postgres@localhost::master_port/regression?application_name=psql
 SET search_path TO pg17;
@@ -2718,10 +2719,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..31dee46e7cd 100644
--- a/src/test/regress/sql/pg17.sql
+++ b/src/test/regress/sql/pg17.sql
@@ -1465,6 +1465,8 @@ USING pg_catalog.pg_class AS ref_0
 ON target_0.id = ref_0.relpages
 WHEN NOT MATCHED THEN DO NOTHING;
 
+DROP TABLE non_dist_table_12345;
+
 -- Step 3: Switch back to the coordinator for distributed table operations
 \c postgresql://postgres@localhost::master_port/regression?application_name=psql
 SET search_path TO pg17;
@@ -1479,10 +1481,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