diff --git a/src/test/regress/expected/fkeys_between_local_ref.out b/src/test/regress/expected/fkeys_between_local_ref.out
index 8d41a0422..87429f0f3 100644
--- a/src/test/regress/expected/fkeys_between_local_ref.out
+++ b/src/test/regress/expected/fkeys_between_local_ref.out
@@ -309,7 +309,7 @@ BEGIN;
 
   -- show that we validate foreign key constraints, errors out
   INSERT INTO local_table_5 VALUES (300);
-ERROR:  insert or update on table "local_table_5_1518073" violates foreign key constraint "local_table_5_col_1_fkey1_1518073"
+ERROR:  insert or update on table "local_table_5_1518069" violates foreign key constraint "local_table_5_col_1_fkey1_1518069"
 ROLLBACK;
 BEGIN;
   CREATE TABLE local_table_6 (col_1 INT PRIMARY KEY);
diff --git a/src/test/regress/expected/multi_partitioning.out b/src/test/regress/expected/multi_partitioning.out
index fed9039a2..482d41589 100644
--- a/src/test/regress/expected/multi_partitioning.out
+++ b/src/test/regress/expected/multi_partitioning.out
@@ -4208,7 +4208,11 @@ SELECT partition FROM time_partitions WHERE parent_table = 'date_partitioned_tab
 (1 row)
 
 \set VERBOSITY default
+set client_min_messages to error;
 DROP TABLE date_partitioned_table_to_exp;
+DROP TABLE date_partitioned_citus_local_table CASCADE;
+DROP TABLE date_partitioned_citus_local_table_2;
+set client_min_messages to notice;
 SELECT citus_remove_node('localhost', :master_port);
  citus_remove_node
 ---------------------------------------------------------------------
@@ -4326,12 +4330,10 @@ NOTICE:  dropping metadata on the node (localhost,57637)
 (1 row)
 
 DROP SCHEMA partitioning_schema CASCADE;
-NOTICE:  drop cascades to 6 other objects
+NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to table partitioning_schema."schema-test"
 drop cascades to table partitioning_schema.another_distributed_table
 drop cascades to table partitioning_schema.distributed_parent_table
-drop cascades to table partitioning_schema.date_partitioned_citus_local_table
-drop cascades to table partitioning_schema.date_partitioned_citus_local_table_2
 drop cascades to table partitioning_schema.part_table_with_very_long_name
 RESET search_path;
 DROP TABLE IF EXISTS
diff --git a/src/test/regress/sql/multi_partitioning.sql b/src/test/regress/sql/multi_partitioning.sql
index d5c513b7c..702ffbe23 100644
--- a/src/test/regress/sql/multi_partitioning.sql
+++ b/src/test/regress/sql/multi_partitioning.sql
@@ -1932,7 +1932,11 @@ CALL drop_old_time_partitions('date_partitioned_table_to_exp', '2021-01-01');
 SELECT partition FROM time_partitions WHERE parent_table = 'date_partitioned_table_to_exp'::regclass ORDER BY partition::text;
 
 \set VERBOSITY default
+set client_min_messages to error;
 DROP TABLE date_partitioned_table_to_exp;
+DROP TABLE date_partitioned_citus_local_table CASCADE;
+DROP TABLE date_partitioned_citus_local_table_2;
+set client_min_messages to notice;
 
 SELECT citus_remove_node('localhost', :master_port);