diff --git a/src/test/regress/expected/auto_undist_citus_local.out b/src/test/regress/expected/auto_undist_citus_local.out
index 71c614c79..3d9ae4841 100644
--- a/src/test/regress/expected/auto_undist_citus_local.out
+++ b/src/test/regress/expected/auto_undist_citus_local.out
@@ -5,6 +5,7 @@ CREATE SCHEMA drop_fkey_cascade;
 SET search_path TO drop_fkey_cascade;
 SET client_min_messages TO WARNING;
 SET citus.next_shard_id TO 1810000;
+SET citus.next_placement_id TO 3070000;
 SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
diff --git a/src/test/regress/expected/create_ref_dist_from_citus_local.out b/src/test/regress/expected/create_ref_dist_from_citus_local.out
index a4eceb8e1..7f6821b1f 100644
--- a/src/test/regress/expected/create_ref_dist_from_citus_local.out
+++ b/src/test/regress/expected/create_ref_dist_from_citus_local.out
@@ -1,5 +1,6 @@
 \set VERBOSITY terse
 SET citus.next_shard_id TO 1800000;
+SET citus.next_placement_id TO 8500000;
 SET citus.shard_replication_factor TO 1;
 CREATE SCHEMA create_ref_dist_from_citus_local;
 SET search_path TO create_ref_dist_from_citus_local;
diff --git a/src/test/regress/expected/fkeys_between_local_ref.out b/src/test/regress/expected/fkeys_between_local_ref.out
index 49fc9d100..b142bd4d3 100644
--- a/src/test/regress/expected/fkeys_between_local_ref.out
+++ b/src/test/regress/expected/fkeys_between_local_ref.out
@@ -1,5 +1,6 @@
 \set VERBOSITY terse
 SET citus.next_shard_id TO 1518000;
+SET citus.next_placement_id TO 4090000;
 SET citus.shard_replication_factor TO 1;
 CREATE SCHEMA fkeys_between_local_ref;
 SET search_path TO fkeys_between_local_ref;
diff --git a/src/test/regress/expected/local_shard_utility_command_execution.out b/src/test/regress/expected/local_shard_utility_command_execution.out
index 0e846f4a0..45c9dbb68 100644
--- a/src/test/regress/expected/local_shard_utility_command_execution.out
+++ b/src/test/regress/expected/local_shard_utility_command_execution.out
@@ -5,6 +5,7 @@
 -- (shouldHaveShards = on) and having reference table placements in it.
 \set VERBOSITY terse
 SET citus.next_shard_id TO 1500000;
+SET citus.next_placement_id TO 8300000;
 SET citus.shard_replication_factor TO 1;
 SET citus.enable_local_execution TO ON;
 SET citus.shard_COUNT TO 32;
diff --git a/src/test/regress/expected/multi_fix_partition_shard_index_names.out b/src/test/regress/expected/multi_fix_partition_shard_index_names.out
index bab862c50..ff46c5c8a 100644
--- a/src/test/regress/expected/multi_fix_partition_shard_index_names.out
+++ b/src/test/regress/expected/multi_fix_partition_shard_index_names.out
@@ -8,6 +8,13 @@ SET citus.next_shard_id TO 910000;
 SET citus.shard_replication_factor TO 1;
 CREATE SCHEMA fix_idx_names;
 SET search_path TO fix_idx_names, public;
+SELECT stop_metadata_sync_to_node('localhost', :worker_1_port);
+NOTICE:  dropping metadata on the node (localhost,57637)
+ stop_metadata_sync_to_node
+---------------------------------------------------------------------
+
+(1 row)
+
 -- NULL input should automatically return NULL since
 -- fix_partition_shard_index_names is strict
 -- same for worker_fix_partition_shard_index_names
@@ -231,13 +238,6 @@ SELECT tablename, indexname FROM pg_indexes WHERE schemaname = 'fix_idx_names' O
 
 \c - - - :master_port
 SET search_path TO fix_idx_names, public;
-SELECT stop_metadata_sync_to_node('localhost', :worker_1_port);
-NOTICE:  dropping metadata on the node (localhost,57637)
- stop_metadata_sync_to_node
----------------------------------------------------------------------
-
-(1 row)
-
 DROP INDEX short;
 DROP TABLE yet_another_partition_table, another_partition_table_with_very_long_name;
 -- this will create constraint1 index on parent
diff --git a/src/test/regress/expected/multi_transactional_drop_shards.out b/src/test/regress/expected/multi_transactional_drop_shards.out
index a1a64c898..e79b08b8e 100644
--- a/src/test/regress/expected/multi_transactional_drop_shards.out
+++ b/src/test/regress/expected/multi_transactional_drop_shards.out
@@ -3,6 +3,7 @@
 --
 -- Tests that check the metadata returned by the master node.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1410000;
+ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 4230000;
 SET citus.shard_count TO 4;
 SET client_min_messages TO WARNING;
 -- test DROP TABLE(ergo citus_drop_all_shards) in transaction, then ROLLBACK
diff --git a/src/test/regress/sql/alter_index.sql b/src/test/regress/sql/alter_index.sql
index 8e08c1f56..3531bad18 100644
--- a/src/test/regress/sql/alter_index.sql
+++ b/src/test/regress/sql/alter_index.sql
@@ -31,7 +31,7 @@ ORDER BY c.relname, a.attnum;
 \c - - - :worker_1_port
 SELECT c.relname, a.attstattarget
 FROM pg_attribute a
-JOIN pg_class c ON a.attrelid = c.oid AND c.relname LIKE 'test\_idx%\_\d%'
+JOIN pg_class c ON a.attrelid = c.oid AND c.relname SIMILAR TO 'test\_idx%\_\d%'
 ORDER BY c.relname, a.attnum;
 \c - - - :master_port
 
diff --git a/src/test/regress/sql/auto_undist_citus_local.sql b/src/test/regress/sql/auto_undist_citus_local.sql
index 66ce13ea3..2dd6d74ca 100644
--- a/src/test/regress/sql/auto_undist_citus_local.sql
+++ b/src/test/regress/sql/auto_undist_citus_local.sql
@@ -5,6 +5,7 @@ CREATE SCHEMA drop_fkey_cascade;
 SET search_path TO drop_fkey_cascade;
 SET client_min_messages TO WARNING;
 SET citus.next_shard_id TO 1810000;
+SET citus.next_placement_id TO 3070000;
 
 SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
 
diff --git a/src/test/regress/sql/create_ref_dist_from_citus_local.sql b/src/test/regress/sql/create_ref_dist_from_citus_local.sql
index 6d01aa47c..7693d3300 100644
--- a/src/test/regress/sql/create_ref_dist_from_citus_local.sql
+++ b/src/test/regress/sql/create_ref_dist_from_citus_local.sql
@@ -1,6 +1,7 @@
 \set VERBOSITY terse
 
 SET citus.next_shard_id TO 1800000;
+SET citus.next_placement_id TO 8500000;
 SET citus.shard_replication_factor TO 1;
 
 CREATE SCHEMA create_ref_dist_from_citus_local;
diff --git a/src/test/regress/sql/fkeys_between_local_ref.sql b/src/test/regress/sql/fkeys_between_local_ref.sql
index 630cde968..6afce7f3f 100644
--- a/src/test/regress/sql/fkeys_between_local_ref.sql
+++ b/src/test/regress/sql/fkeys_between_local_ref.sql
@@ -1,6 +1,7 @@
 \set VERBOSITY terse
 
 SET citus.next_shard_id TO 1518000;
+SET citus.next_placement_id TO 4090000;
 SET citus.shard_replication_factor TO 1;
 
 CREATE SCHEMA fkeys_between_local_ref;
diff --git a/src/test/regress/sql/local_shard_utility_command_execution.sql b/src/test/regress/sql/local_shard_utility_command_execution.sql
index d754c5888..bebaa5167 100644
--- a/src/test/regress/sql/local_shard_utility_command_execution.sql
+++ b/src/test/regress/sql/local_shard_utility_command_execution.sql
@@ -7,6 +7,7 @@
 \set VERBOSITY terse
 
 SET citus.next_shard_id TO 1500000;
+SET citus.next_placement_id TO 8300000;
 SET citus.shard_replication_factor TO 1;
 SET citus.enable_local_execution TO ON;
 SET citus.shard_COUNT TO 32;
diff --git a/src/test/regress/sql/multi_fix_partition_shard_index_names.sql b/src/test/regress/sql/multi_fix_partition_shard_index_names.sql
index 0d7c6cffa..43bba3b92 100644
--- a/src/test/regress/sql/multi_fix_partition_shard_index_names.sql
+++ b/src/test/regress/sql/multi_fix_partition_shard_index_names.sql
@@ -9,6 +9,8 @@ SET citus.shard_replication_factor TO 1;
 CREATE SCHEMA fix_idx_names;
 SET search_path TO fix_idx_names, public;
 
+SELECT stop_metadata_sync_to_node('localhost', :worker_1_port);
+
 -- NULL input should automatically return NULL since
 -- fix_partition_shard_index_names is strict
 -- same for worker_fix_partition_shard_index_names
@@ -107,7 +109,6 @@ SELECT tablename, indexname FROM pg_indexes WHERE schemaname = 'fix_idx_names' O
 
 \c - - - :master_port
 SET search_path TO fix_idx_names, public;
-SELECT stop_metadata_sync_to_node('localhost', :worker_1_port);
 
 DROP INDEX short;
 DROP TABLE yet_another_partition_table, another_partition_table_with_very_long_name;
diff --git a/src/test/regress/sql/multi_transactional_drop_shards.sql b/src/test/regress/sql/multi_transactional_drop_shards.sql
index ddbcf9851..79291eb50 100644
--- a/src/test/regress/sql/multi_transactional_drop_shards.sql
+++ b/src/test/regress/sql/multi_transactional_drop_shards.sql
@@ -5,6 +5,7 @@
 
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1410000;
+ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 4230000;
 
 SET citus.shard_count TO 4;
 SET client_min_messages TO WARNING;