diff --git a/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out b/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out
index d033aec06..03c26669e 100644
--- a/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out
+++ b/src/test/regress/expected/isolation_create_table_vs_add_remove_node.out
@@ -299,7 +299,7 @@ step s2-commit:
 	COMMIT;
 
 step s1-remove-node-2: <... completed>
-error in steps s2-commit s1-remove-node-2: ERROR:  you cannot remove a node which has shard placements
+error in steps s2-commit s1-remove-node-2: ERROR:  you cannot remove the primary node of a node group which has shard placements
 step s1-show-placements: 
 	SELECT
 		nodename, nodeport
@@ -389,7 +389,7 @@ create_distributed_table
 step s1-remove-node-2: 
 	SELECT * FROM master_remove_node('localhost', 57638);
 
-ERROR:  you cannot remove a node which has shard placements
+ERROR:  you cannot remove the primary node of a node group which has shard placements
 step s1-commit: 
 	COMMIT;
 
diff --git a/src/test/regress/expected/isolation_distributed_transaction_id.out b/src/test/regress/expected/isolation_distributed_transaction_id.out
index 0c4c2584b..41806ad2e 100644
--- a/src/test/regress/expected/isolation_distributed_transaction_id.out
+++ b/src/test/regress/expected/isolation_distributed_transaction_id.out
@@ -98,7 +98,7 @@ step s1-get-current-transaction-id:
 
 row            
 
-(0,279)        
+(0,290)        
 step s2-get-first-worker-active-transactions: 
 		SELECT * FROM run_command_on_workers('SELECT row(initiator_node_identifier, transaction_number)
 												FROM	 
@@ -109,4 +109,4 @@ step s2-get-first-worker-active-transactions:
 
 nodename       nodeport       success        result         
 
-localhost      57637          t              (0,279)        
+localhost      57637          t              (0,290)        
diff --git a/src/test/regress/expected/isolation_dump_global_wait_edges.out b/src/test/regress/expected/isolation_dump_global_wait_edges.out
index 16b50ba93..6365b7719 100644
--- a/src/test/regress/expected/isolation_dump_global_wait_edges.out
+++ b/src/test/regress/expected/isolation_dump_global_wait_edges.out
@@ -29,11 +29,11 @@ step detector-dump-wait-edges:
 
 waiting_transaction_numblocking_transaction_numblocking_transaction_waiting
 
-192            191            f              
+293            292            f              
 transactionnumberwaitingtransactionnumbers
 
-191                           
-192            191            
+292                           
+293            292            
 step s1-abort: 
     ABORT;
 
@@ -77,14 +77,14 @@ step detector-dump-wait-edges:
 
 waiting_transaction_numblocking_transaction_numblocking_transaction_waiting
 
-196            195            f              
-197            195            f              
-197            196            t              
+297            296            f              
+298            296            f              
+298            297            t              
 transactionnumberwaitingtransactionnumbers
 
-195                           
-196            195            
-197            195,196        
+296                           
+297            296            
+298            296,297        
 step s1-abort: 
     ABORT;
 
diff --git a/src/test/regress/expected/isolation_replace_wait_function.out b/src/test/regress/expected/isolation_replace_wait_function.out
index 265a66afb..2b0cbd87c 100644
--- a/src/test/regress/expected/isolation_replace_wait_function.out
+++ b/src/test/regress/expected/isolation_replace_wait_function.out
@@ -16,7 +16,7 @@ step s1-finish:
   COMMIT;
 
 step s2-insert: <... completed>
-error in steps s1-finish s2-insert: ERROR:  duplicate key value violates unique constraint "test_locking_a_key_102751"
+error in steps s1-finish s2-insert: ERROR:  duplicate key value violates unique constraint "test_locking_a_key_102781"
 step s2-finish: 
   COMMIT;