diff --git a/src/test/regress/expected/multi_shard_update_delete.out b/src/test/regress/expected/multi_shard_update_delete.out
index ce597cafc..c4188e65b 100644
--- a/src/test/regress/expected/multi_shard_update_delete.out
+++ b/src/test/regress/expected/multi_shard_update_delete.out
@@ -393,20 +393,20 @@ WHERE  user_id IN (SELECT user_id
               FROM   users_test_table
               UNION
               SELECT user_id
-              FROM   events_test_table) returning *;
- user_id | value_1 | value_2 | value_3 
----------+---------+---------+---------
-       8 |       4 |      13 |       0
-      20 |       4 |         |       0
-      20 |       4 |         |       0
-      20 |       4 |         |       0
-       4 |       4 |       9 |       0
-       4 |       4 |      17 |       0
-      16 |       4 |         |       0
-       6 |       4 |      11 |       0
-       6 |       4 |      15 |       0
-       2 |       4 |       7 |       0
-       2 |       4 |      19 |       0
+              FROM   events_test_table) returning value_3; 
+ value_3 
+---------
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
 (11 rows)
 
 UPDATE users_test_table
@@ -750,11 +750,11 @@ ERROR:  more than one row returned by a subquery used as an expression
 CONTEXT:  while executing command on localhost:57637
 -- Cursors are not supported
 BEGIN;
-DECLARE test_cursor CURSOR FOR SELECT * FROM users_test_table;
+DECLARE test_cursor CURSOR FOR SELECT * FROM users_test_table ORDER BY user_id;
 FETCH test_cursor;
  user_id | value_1 | value_2 | value_3 
 ---------+---------+---------+---------
-       8 |       4 |       0 |       0
+       1 |       2 |       5 |       0
 (1 row)
 
 UPDATE users_test_table SET value_2 = 5 WHERE CURRENT OF test_cursor;
diff --git a/src/test/regress/expected/multi_shard_update_delete_0.out b/src/test/regress/expected/multi_shard_update_delete_0.out
index 3d340c29a..0181e1828 100644
--- a/src/test/regress/expected/multi_shard_update_delete_0.out
+++ b/src/test/regress/expected/multi_shard_update_delete_0.out
@@ -416,20 +416,20 @@ WHERE  user_id IN (SELECT user_id
               FROM   users_test_table
               UNION
               SELECT user_id
-              FROM   events_test_table) returning *;
- user_id | value_1 | value_2 | value_3 
----------+---------+---------+---------
-       8 |       4 |      13 |       0
-      20 |       4 |         |       0
-      20 |       4 |         |       0
-      20 |       4 |         |       0
-       4 |       4 |       9 |       0
-       4 |       4 |      17 |       0
-      16 |       4 |         |       0
-       6 |       4 |      11 |       0
-       6 |       4 |      15 |       0
-       2 |       4 |       7 |       0
-       2 |       4 |      19 |       0
+              FROM   events_test_table) returning value_3; 
+ value_3 
+---------
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
+       0
 (11 rows)
 
 UPDATE users_test_table
@@ -773,11 +773,11 @@ ERROR:  more than one row returned by a subquery used as an expression
 CONTEXT:  while executing command on localhost:57637
 -- Cursors are not supported
 BEGIN;
-DECLARE test_cursor CURSOR FOR SELECT * FROM users_test_table;
+DECLARE test_cursor CURSOR FOR SELECT * FROM users_test_table ORDER BY user_id;
 FETCH test_cursor;
  user_id | value_1 | value_2 | value_3 
 ---------+---------+---------+---------
-       8 |       4 |       0 |       0
+       1 |       2 |       5 |       0
 (1 row)
 
 UPDATE users_test_table SET value_2 = 5 WHERE CURRENT OF test_cursor;
diff --git a/src/test/regress/sql/multi_shard_update_delete.sql b/src/test/regress/sql/multi_shard_update_delete.sql
index 147db404c..ad6bf5d34 100644
--- a/src/test/regress/sql/multi_shard_update_delete.sql
+++ b/src/test/regress/sql/multi_shard_update_delete.sql
@@ -306,7 +306,7 @@ WHERE  user_id IN (SELECT user_id
               FROM   users_test_table
               UNION
               SELECT user_id
-              FROM   events_test_table) returning *;
+              FROM   events_test_table) returning value_3; 
 
 UPDATE users_test_table
 SET    value_1 = 4
@@ -634,7 +634,7 @@ WHERE  users_test_table.user_id = (SELECT user_id
 
 -- Cursors are not supported
 BEGIN;
-DECLARE test_cursor CURSOR FOR SELECT * FROM users_test_table;
+DECLARE test_cursor CURSOR FOR SELECT * FROM users_test_table ORDER BY user_id;
 FETCH test_cursor;
 UPDATE users_test_table SET value_2 = 5 WHERE CURRENT OF test_cursor;
 ROLLBACK;