diff --git a/src/test/regress/expected/multi_modifying_xacts.out b/src/test/regress/expected/multi_modifying_xacts.out
index b64963ae2..7c3344ee5 100644
--- a/src/test/regress/expected/multi_modifying_xacts.out
+++ b/src/test/regress/expected/multi_modifying_xacts.out
@@ -1332,8 +1332,6 @@ ERROR:  connection to the remote node localhost:xxxxx failed with the following
 -- connect back to the master with the proper user to continue the tests
 \c - :default_user - :master_port
 SET search_path TO multi_modifying_xacts;
-SET citus.next_shard_id TO 1200020;
-SET citus.next_placement_id TO 1200033;
 -- unbreak both nodes by renaming the user back to the original name
 \c - :default_user - :worker_2_port
 SET search_path TO multi_modifying_xacts;
@@ -1347,6 +1345,8 @@ ALTER USER test_user_new RENAME TO test_user;
 set citus.enable_alter_role_propagation=true;
 \c - :default_user - :master_port
 SET search_path TO multi_modifying_xacts;
+SET citus.next_shard_id TO 1200020;
+SET citus.next_placement_id TO 1200033;
 DROP TABLE reference_modifying_xacts, hash_modifying_xacts, hash_modifying_xacts_second,
 	reference_failure_test, numbers_hash_failure_test;
 REVOKE ALL ON SCHEMA multi_modifying_xacts FROM test_user;
@@ -1411,16 +1411,16 @@ ORDER BY
   id;
  id |             shard_name              | nodename  | nodeport
 ---------------------------------------------------------------------
-  1 | multi_modifying_xacts.users_1190016 | localhost |    57637
-  2 | multi_modifying_xacts.users_1190019 | localhost |    57638
-  3 | multi_modifying_xacts.users_1190017 | localhost |    57638
-  4 | multi_modifying_xacts.users_1190017 | localhost |    57638
-  5 | multi_modifying_xacts.users_1190016 | localhost |    57637
-  6 | multi_modifying_xacts.users_1190018 | localhost |    57637
-  7 | multi_modifying_xacts.users_1190017 | localhost |    57638
-  8 | multi_modifying_xacts.users_1190016 | localhost |    57637
-  9 | multi_modifying_xacts.users_1190019 | localhost |    57638
- 10 | multi_modifying_xacts.users_1190016 | localhost |    57637
+  1 | multi_modifying_xacts.users_1200022 | localhost |    57637
+  2 | multi_modifying_xacts.users_1200025 | localhost |    57638
+  3 | multi_modifying_xacts.users_1200023 | localhost |    57638
+  4 | multi_modifying_xacts.users_1200023 | localhost |    57638
+  5 | multi_modifying_xacts.users_1200022 | localhost |    57637
+  6 | multi_modifying_xacts.users_1200024 | localhost |    57637
+  7 | multi_modifying_xacts.users_1200023 | localhost |    57638
+  8 | multi_modifying_xacts.users_1200022 | localhost |    57637
+  9 | multi_modifying_xacts.users_1200025 | localhost |    57638
+ 10 | multi_modifying_xacts.users_1200022 | localhost |    57637
 (10 rows)
 
 END;
diff --git a/src/test/regress/sql/multi_modifying_xacts.sql b/src/test/regress/sql/multi_modifying_xacts.sql
index 5a1cce017..8b90d9267 100644
--- a/src/test/regress/sql/multi_modifying_xacts.sql
+++ b/src/test/regress/sql/multi_modifying_xacts.sql
@@ -1065,8 +1065,7 @@ INSERT INTO numbers_hash_failure_test VALUES (2,2);
 -- connect back to the master with the proper user to continue the tests
 \c - :default_user - :master_port
 SET search_path TO multi_modifying_xacts;
-SET citus.next_shard_id TO 1200020;
-SET citus.next_placement_id TO 1200033;
+
 -- unbreak both nodes by renaming the user back to the original name
 \c - :default_user - :worker_2_port
 SET search_path TO multi_modifying_xacts;
@@ -1083,6 +1082,9 @@ set citus.enable_alter_role_propagation=true;
 \c - :default_user - :master_port
 SET search_path TO multi_modifying_xacts;
 
+SET citus.next_shard_id TO 1200020;
+SET citus.next_placement_id TO 1200033;
+
 DROP TABLE reference_modifying_xacts, hash_modifying_xacts, hash_modifying_xacts_second,
 	reference_failure_test, numbers_hash_failure_test;