diff --git a/src/test/regress/expected/minimal_cluster_management.out b/src/test/regress/expected/minimal_cluster_management.out
index 87f8be882..09fcf7b4a 100644
--- a/src/test/regress/expected/minimal_cluster_management.out
+++ b/src/test/regress/expected/minimal_cluster_management.out
@@ -21,23 +21,6 @@ SELECT pg_reload_conf();
  t
 (1 row)
 
-\c - - - :master_port
-\c - - - :worker_1_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
- pg_reload_conf
----------------------------------------------------------------------
- t
-(1 row)
-
-\c - - - :worker_2_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
- pg_reload_conf
----------------------------------------------------------------------
- t
-(1 row)
-
 \c - - - :master_port
 SET citus.next_shard_id TO 1220000;
 ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1390000;
diff --git a/src/test/regress/expected/multi_follower_sanity_check.out b/src/test/regress/expected/multi_follower_sanity_check.out
index 6d5a0e1f6..b24ae4e30 100644
--- a/src/test/regress/expected/multi_follower_sanity_check.out
+++ b/src/test/regress/expected/multi_follower_sanity_check.out
@@ -1,4 +1,27 @@
 -- check that the nodes are all in read-only mode and rejecting write queries
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :worker_1_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :worker_2_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
 \c - - - :follower_master_port
 CREATE TABLE tab (a int);
 ERROR:  cannot execute CREATE TABLE in a read-only transaction
diff --git a/src/test/regress/expected/multi_test_helpers.out b/src/test/regress/expected/multi_test_helpers.out
index 0f31f2354..36b1be250 100644
--- a/src/test/regress/expected/multi_test_helpers.out
+++ b/src/test/regress/expected/multi_test_helpers.out
@@ -1,4 +1,28 @@
 -- File to create functions and helpers needed for subsequent tests
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :worker_1_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :worker_2_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :master_port
 -- create a helper function to create objects on each node
 CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text)
 RETURNS void LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/expected/single_node_enterprise.out b/src/test/regress/expected/single_node_enterprise.out
index 79f231864..9e3ffad76 100644
--- a/src/test/regress/expected/single_node_enterprise.out
+++ b/src/test/regress/expected/single_node_enterprise.out
@@ -1,3 +1,28 @@
+
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :worker_1_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :worker_2_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+ pg_reload_conf
+---------------------------------------------------------------------
+ t
+(1 row)
+
+\c - - - :master_port
 -- we already have lots of tests targeting
 -- single node citus clusters in sql/single_node.sql
 -- in this file, we are testing enterprise features
diff --git a/src/test/regress/sql/minimal_cluster_management.sql b/src/test/regress/sql/minimal_cluster_management.sql
index 1bb17c753..fffcb18fa 100644
--- a/src/test/regress/sql/minimal_cluster_management.sql
+++ b/src/test/regress/sql/minimal_cluster_management.sql
@@ -9,14 +9,6 @@ SELECT pg_reload_conf();
 ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
 SELECT pg_reload_conf();
 
-\c - - - :master_port
-\c - - - :worker_1_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
-
-\c - - - :worker_2_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
 
 \c - - - :master_port
 SET citus.next_shard_id TO 1220000;
diff --git a/src/test/regress/sql/multi_follower_sanity_check.sql b/src/test/regress/sql/multi_follower_sanity_check.sql
index 3059b9f9f..47e1d724e 100644
--- a/src/test/regress/sql/multi_follower_sanity_check.sql
+++ b/src/test/regress/sql/multi_follower_sanity_check.sql
@@ -1,4 +1,14 @@
 -- check that the nodes are all in read-only mode and rejecting write queries
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+
+\c - - - :worker_1_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+
+\c - - - :worker_2_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
 
 \c - - - :follower_master_port
 CREATE TABLE tab (a int);
diff --git a/src/test/regress/sql/multi_test_helpers.sql b/src/test/regress/sql/multi_test_helpers.sql
index 7d218361c..350240494 100644
--- a/src/test/regress/sql/multi_test_helpers.sql
+++ b/src/test/regress/sql/multi_test_helpers.sql
@@ -1,5 +1,15 @@
 -- File to create functions and helpers needed for subsequent tests
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
 
+\c - - - :worker_1_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+
+\c - - - :worker_2_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+\c - - - :master_port
 -- create a helper function to create objects on each node
 CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text)
 RETURNS void LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/sql/single_node_enterprise.sql b/src/test/regress/sql/single_node_enterprise.sql
index 19393ba24..6cfbbadc8 100644
--- a/src/test/regress/sql/single_node_enterprise.sql
+++ b/src/test/regress/sql/single_node_enterprise.sql
@@ -1,6 +1,19 @@
 -- we already have lots of tests targeting
 -- single node citus clusters in sql/single_node.sql
 -- in this file, we are testing enterprise features
+
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+
+\c - - - :worker_1_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+
+\c - - - :worker_2_port
+ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
+SELECT pg_reload_conf();
+
+\c - - - :master_port
 CREATE SCHEMA single_node_ent;
 SET search_path TO single_node_ent;
 SET citus.shard_count TO 4;