diff --git a/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out b/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out
index ee60bfe8a..1481d786f 100644
--- a/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out
+++ b/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out
@@ -77,18 +77,20 @@ SELECT slot_name FROM pg_replication_slots;
 (0 rows)
 
 -- Publications should be cleaned up on worker1
-SELECT * FROM pg_publication;
- oid | pubname | pubowner | puballtables | pubinsert | pubupdate | pubdelete | pubtruncate | pubviaroot
+SELECT count(*) FROM pg_publication;
+ count
 ---------------------------------------------------------------------
-(0 rows)
+     0
+(1 row)
 
 \c - - - :worker_2_port
 SET search_path TO "citus_split_test_schema";
 -- All subscriptions should be cleaned up.
-SELECT * FROM pg_subscription;
- oid | subdbid | subname | subowner | subenabled | subbinary | substream | subconninfo | subslotname | subsynccommit | subpublications
+SELECT count(*) FROM pg_subscription;
+ count
 ---------------------------------------------------------------------
-(0 rows)
+     0
+(1 row)
 
 -- Trigger a 3-way local split.
 \c - - - :master_port
@@ -112,14 +114,16 @@ SELECT slot_name FROM pg_replication_slots;
 (0 rows)
 
 -- Publications should be cleanedup
-SELECT * FROM pg_publication;
- oid | pubname | pubowner | puballtables | pubinsert | pubupdate | pubdelete | pubtruncate | pubviaroot
+SELECT count(*) FROM pg_publication;
+ count
 ---------------------------------------------------------------------
-(0 rows)
+     0
+(1 row)
 
 -- All subscriptions should be cleaned up.
-SELECT * FROM pg_subscription;
- oid | subdbid | subname | subowner | subenabled | subbinary | substream | subconninfo | subslotname | subsynccommit | subpublications
+SELECT count(*) FROM pg_subscription;
+ count
 ---------------------------------------------------------------------
-(0 rows)
+     0
+(1 row)
 
diff --git a/src/test/regress/expected/citus_split_shard_by_split_points_negative.out b/src/test/regress/expected/citus_split_shard_by_split_points_negative.out
index 2445c1e18..1bb3fb12d 100644
--- a/src/test/regress/expected/citus_split_shard_by_split_points_negative.out
+++ b/src/test/regress/expected/citus_split_shard_by_split_points_negative.out
@@ -32,19 +32,7 @@ SELECT create_distributed_table('table_to_split','id');
 
 SELECT nodeid AS worker_1_node FROM pg_dist_node WHERE nodeport=:worker_1_port \gset
 SELECT nodeid AS worker_2_node FROM pg_dist_node WHERE nodeport=:worker_2_port \gset
--- UDF fails for any other shard_transfer_mode other than block_writes.
-SELECT citus_split_shard_by_split_points(
-	49761302,
-	ARRAY['50'],
-	ARRAY[101, 201],
-    'auto');
-ERROR:  Shard Tranfer mode: 'auto' is not supported. Please use 'block_writes' instead.
-SELECT citus_split_shard_by_split_points(
-	49761302,
-	ARRAY['50'],
-	ARRAY[101, 201],
-    'force_logical');
-ERROR:  Shard Tranfer mode: 'force_logical' is not supported. Please use 'block_writes' instead.
+-- UDF fails for any other shard_transfer_mode other than block_writes/force_logical/auto.
 SELECT citus_split_shard_by_split_points(
 	49761302,
 	ARRAY['50'],
diff --git a/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql b/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql
index 59f4fc2ce..a87028233 100644
--- a/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql
+++ b/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql
@@ -66,12 +66,12 @@ SELECT count(*) FROM pg_class where relname like '%sensors_8981008%';
 SELECT slot_name FROM pg_replication_slots;
 
 -- Publications should be cleaned up on worker1
-SELECT * FROM pg_publication;
+SELECT count(*) FROM pg_publication;
 
 \c - - - :worker_2_port
 SET search_path TO "citus_split_test_schema";
 -- All subscriptions should be cleaned up.
-SELECT * FROM pg_subscription;
+SELECT count(*) FROM pg_subscription;
 
 -- Trigger a 3-way local split.
 \c - - - :master_port
@@ -88,6 +88,6 @@ SET search_path TO "citus_split_test_schema";
 SELECT slot_name FROM pg_replication_slots;
 
 -- Publications should be cleanedup
-SELECT * FROM pg_publication;
+SELECT count(*) FROM pg_publication;
 -- All subscriptions should be cleaned up.
-SELECT * FROM pg_subscription;
+SELECT count(*) FROM pg_subscription;
diff --git a/src/test/regress/sql/citus_split_shard_by_split_points_negative.sql b/src/test/regress/sql/citus_split_shard_by_split_points_negative.sql
index ad76c5c7c..ebcd79c5e 100644
--- a/src/test/regress/sql/citus_split_shard_by_split_points_negative.sql
+++ b/src/test/regress/sql/citus_split_shard_by_split_points_negative.sql
@@ -23,19 +23,7 @@ SELECT create_distributed_table('table_to_split','id');
 SELECT nodeid AS worker_1_node FROM pg_dist_node WHERE nodeport=:worker_1_port \gset
 SELECT nodeid AS worker_2_node FROM pg_dist_node WHERE nodeport=:worker_2_port \gset
 
--- UDF fails for any other shard_transfer_mode other than block_writes.
-SELECT citus_split_shard_by_split_points(
-	49761302,
-	ARRAY['50'],
-	ARRAY[101, 201],
-    'auto');
-
-SELECT citus_split_shard_by_split_points(
-	49761302,
-	ARRAY['50'],
-	ARRAY[101, 201],
-    'force_logical');
-
+-- UDF fails for any other shard_transfer_mode other than block_writes/force_logical/auto.
 SELECT citus_split_shard_by_split_points(
 	49761302,
 	ARRAY['50'],