diff --git a/src/test/regress/expected/multi_real_time_transaction.out b/src/test/regress/expected/multi_real_time_transaction.out
index 5bd561a2d..8486409bb 100644
--- a/src/test/regress/expected/multi_real_time_transaction.out
+++ b/src/test/regress/expected/multi_real_time_transaction.out
@@ -344,8 +344,6 @@ ROLLBACK;
 -- test propagation of SET LOCAL
 -- gonna need a non-superuser as we'll use RLS to test GUC propagation
 CREATE USER rls_user;
-GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user;
-GRANT ALL ON ALL TABLES IN SCHEMA multi_real_time_transaction TO rls_user;
 SELECT run_command_on_workers('CREATE USER rls_user');
       run_command_on_workers       
 -----------------------------------
@@ -353,6 +351,8 @@ SELECT run_command_on_workers('CREATE USER rls_user');
  (localhost,57638,t,"CREATE ROLE")
 (2 rows)
 
+GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user;
+GRANT ALL ON ALL TABLES IN SCHEMA multi_real_time_transaction TO rls_user;
 SELECT run_command_on_workers('GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user');
   run_command_on_workers   
 ---------------------------
diff --git a/src/test/regress/expected/multi_real_time_transaction_0.out b/src/test/regress/expected/multi_real_time_transaction_0.out
deleted file mode 100644
index ab076d91f..000000000
--- a/src/test/regress/expected/multi_real_time_transaction_0.out
+++ /dev/null
@@ -1,482 +0,0 @@
-SET citus.next_shard_id TO 1610000;
-CREATE SCHEMA multi_real_time_transaction;
-SET search_path = 'multi_real_time_transaction';
-SET citus.shard_replication_factor to 1;
-CREATE TABLE test_table(id int, col_1 int, col_2 text);
-SELECT create_distributed_table('test_table','id');
- create_distributed_table 
---------------------------
- 
-(1 row)
-
-\COPY test_table FROM stdin delimiter ',';
-CREATE TABLE co_test_table(id int, col_1 int, col_2 text);
-SELECT create_distributed_table('co_test_table','id');
- create_distributed_table 
---------------------------
- 
-(1 row)
-
-\COPY co_test_table FROM stdin delimiter ',';
-CREATE TABLE ref_test_table(id int, col_1 int, col_2 text);
-SELECT create_reference_table('ref_test_table');
- create_reference_table 
-------------------------
- 
-(1 row)
-
-\COPY ref_test_table FROM stdin delimiter ',';
--- Test with select and router insert
-BEGIN;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-INSERT INTO test_table VALUES(7,8,'gg');
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     7
-(1 row)
-
-ROLLBACK;
--- Test with select and multi-row insert
-BEGIN;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-INSERT INTO test_table VALUES (7,8,'gg'),(8,9,'hh'),(9,10,'ii');
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     9
-(1 row)
-
-ROLLBACK;
--- Test with INSERT .. SELECT
-BEGIN;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-INSERT INTO test_table SELECT * FROM co_test_table;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-    12
-(1 row)
-
-ROLLBACK;
--- Test with COPY
-BEGIN;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-\COPY test_table FROM stdin delimiter ',';
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     9
-(1 row)
-
-ROLLBACK;
--- Test with router update
-BEGIN;
-SELECT SUM(col_1) FROM test_table;
- sum 
------
-  27
-(1 row)
-
-UPDATE test_table SET col_1 = 0 WHERE id = 2;
-DELETE FROM test_table WHERE id = 3;
-SELECT SUM(col_1) FROM test_table;
- sum 
------
-  20
-(1 row)
-
-ROLLBACK;
--- Test with multi-shard update
-BEGIN;
-SELECT SUM(col_1) FROM test_table;
- sum 
------
-  27
-(1 row)
-
-UPDATE test_table SET col_1 = 5;
-SELECT SUM(col_1) FROM test_table;
- sum 
------
-  30
-(1 row)
-
-ROLLBACK;
--- Test with subqueries
-BEGIN;
-SELECT SUM(col_1) FROM test_table;
- sum 
------
-  27
-(1 row)
-
-UPDATE
-	test_table
-SET
-	col_1 = 4
-WHERE
-	test_table.col_1 IN (SELECT co_test_table.col_1 FROM co_test_table WHERE co_test_table.id = 1)
-	AND test_table.id = 1;
-SELECT SUM(col_1) FROM test_table;
- sum 
------
-  29
-(1 row)
-
-ROLLBACK;
--- Test with partitioned table
-CREATE TABLE partitioning_test(id int, time date) PARTITION BY RANGE (time);
-ERROR:  syntax error at or near "PARTITION"
-LINE 1: CREATE TABLE partitioning_test(id int, time date) PARTITION ...
-                                                          ^
-SET citus.shard_replication_factor TO 1;
--- create its partitions
-CREATE TABLE partitioning_test_2009 PARTITION OF partitioning_test FOR VALUES FROM ('2009-01-01') TO ('2010-01-01');
-ERROR:  syntax error at or near "PARTITION"
-LINE 1: CREATE TABLE partitioning_test_2009 PARTITION OF partitionin...
-                                            ^
-CREATE TABLE partitioning_test_2010 PARTITION OF partitioning_test FOR VALUES FROM ('2010-01-01') TO ('2011-01-01');
-ERROR:  syntax error at or near "PARTITION"
-LINE 1: CREATE TABLE partitioning_test_2010 PARTITION OF partitionin...
-                                            ^
--- load some data and distribute tables
-INSERT INTO partitioning_test VALUES (1, '2009-06-06');
-ERROR:  relation "partitioning_test" does not exist
-LINE 1: INSERT INTO partitioning_test VALUES (1, '2009-06-06');
-                    ^
-INSERT INTO partitioning_test VALUES (2, '2010-07-07');
-ERROR:  relation "partitioning_test" does not exist
-LINE 1: INSERT INTO partitioning_test VALUES (2, '2010-07-07');
-                    ^
-SELECT create_distributed_table('partitioning_test', 'id');
-ERROR:  relation "partitioning_test" does not exist
-LINE 1: SELECT create_distributed_table('partitioning_test', 'id');
-                                        ^
-BEGIN;
-SELECT COUNT(*) FROM partitioning_test;
-ERROR:  relation "partitioning_test" does not exist
-LINE 1: SELECT COUNT(*) FROM partitioning_test;
-                             ^
-INSERT INTO partitioning_test_2009 VALUES (3, '2009-09-09');
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-INSERT INTO partitioning_test_2010 VALUES (4, '2010-03-03');
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-SELECT COUNT(*) FROM partitioning_test;
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-COMMIT;
-DROP TABLE partitioning_test;
-ERROR:  table "partitioning_test" does not exist
--- Test with create-drop table
-BEGIN;
-CREATE TABLE test_table_inn(id int, num_1 int);
-SELECT create_distributed_table('test_table_inn','id');
- create_distributed_table 
---------------------------
- 
-(1 row)
-
-INSERT INTO test_table_inn VALUES(1,3),(4,5),(6,7);
-SELECT COUNT(*) FROM test_table_inn;
- count 
--------
-     3
-(1 row)
-
-DROP TABLE test_table_inn;
-COMMIT;
--- Test with utility functions
-BEGIN;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-CREATE INDEX tt_ind_1 ON test_table(col_1);
-ALTER TABLE test_table ADD CONSTRAINT num_check CHECK (col_1 < 50);
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-ROLLBACK;
--- We don't get a distributed transaction id outside a transaction block
-SELECT (get_current_transaction_id()).transaction_number > 0 FROM test_table LIMIT 1;
- ?column? 
-----------
- f
-(1 row)
-
--- We should get a distributed transaction id inside a transaction block
-BEGIN;
-SELECT (get_current_transaction_id()).transaction_number > 0 FROM test_table LIMIT 1;
- ?column? 
-----------
- t
-(1 row)
-
-END;
--- Add a function to insert a row into a table
-SELECT public.run_command_on_master_and_workers($$
-CREATE FUNCTION multi_real_time_transaction.insert_row_test(table_name name)
-RETURNS bool
-AS $BODY$
-BEGIN
-  EXECUTE format('INSERT INTO %s VALUES(100,100,''function'')', table_name);
-  RETURN true;
-END;
-$BODY$ LANGUAGE plpgsql;
-$$);
- run_command_on_master_and_workers 
------------------------------------
- 
-(1 row)
-
--- SELECT should be rolled back because we send BEGIN
-BEGIN;
-SELECT count(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
--- Sneakily insert directly into shards
-SELECT insert_row_test(pg_typeof(test_table)::name) FROM test_table;
- insert_row_test 
------------------
- t
- t
- t
- t
- t
- t
-(6 rows)
-
-SELECT count(*) FROM test_table;
- count 
--------
-    12
-(1 row)
-
-ABORT;
-SELECT count(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
--- Test with foreign key
-ALTER TABLE test_table ADD CONSTRAINT p_key_tt PRIMARY KEY (id);
-ALTER TABLE co_test_table ADD CONSTRAINT f_key_ctt FOREIGN KEY (id) REFERENCES test_table(id) ON DELETE CASCADE;
-BEGIN;
-DELETE FROM test_table where id = 1 or id = 3;
-SELECT * FROM co_test_table;
- id | col_1 | col_2  
-----+-------+--------
-  2 |    30 | 'bb10'
-(1 row)
-
-ROLLBACK;
--- Test cancelling behaviour. See https://github.com/citusdata/citus/pull/1905.
--- Repeating it multiple times to increase the chance of failure before PR #1905.
-SET client_min_messages TO ERROR;
-alter system set deadlock_timeout TO '250ms';
-SELECT pg_reload_conf();
- pg_reload_conf 
-----------------
- t
-(1 row)
-
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
-BEGIN;
-SELECT id, pg_advisory_lock(15) FROM test_table;
-ERROR:  canceling the transaction since it was involved in a distributed deadlock
-ROLLBACK;
--- test propagation of SET LOCAL
--- gonna need a non-superuser as we'll use RLS to test GUC propagation
-CREATE USER rls_user;
-GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user;
-GRANT ALL ON ALL TABLES IN SCHEMA multi_real_time_transaction TO rls_user;
-SELECT run_command_on_workers('CREATE USER rls_user');
-      run_command_on_workers       
------------------------------------
- (localhost,57637,t,"CREATE ROLE")
- (localhost,57638,t,"CREATE ROLE")
-(2 rows)
-
-SELECT run_command_on_workers('GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user');
-  run_command_on_workers   
----------------------------
- (localhost,57637,t,GRANT)
- (localhost,57638,t,GRANT)
-(2 rows)
-
-SELECT run_command_on_workers('GRANT ALL ON ALL TABLES IN SCHEMA multi_real_time_transaction TO rls_user');
-  run_command_on_workers   
----------------------------
- (localhost,57637,t,GRANT)
- (localhost,57638,t,GRANT)
-(2 rows)
-
--- create trigger on one worker to reject access if GUC not
-\c - - - :worker_1_port
-SET search_path = 'multi_real_time_transaction';
-ALTER TABLE test_table_1610000 ENABLE ROW LEVEL SECURITY;
-CREATE POLICY hide_by_default ON test_table_1610000 TO PUBLIC
-    USING (COALESCE(current_setting('app.show_rows', TRUE)::bool, FALSE));
-\c - - - :master_port
-SET ROLE rls_user;
-SET search_path = 'multi_real_time_transaction';
--- shouldn't see all rows because of RLS
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     4
-(1 row)
-
-BEGIN;
--- without enabling SET LOCAL prop, still won't work
-SET LOCAL app.show_rows TO TRUE;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     4
-(1 row)
-
-SET LOCAL citus.propagate_set_commands TO 'local';
--- now we should be good to go
-SET LOCAL app.show_rows TO TRUE;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-SAVEPOINT disable_rls;
-SET LOCAL app.show_rows TO FALSE;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     4
-(1 row)
-
-ROLLBACK TO SAVEPOINT disable_rls;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     6
-(1 row)
-
-SAVEPOINT disable_rls_for_real;
-SET LOCAL app.show_rows TO FALSE;
-RELEASE SAVEPOINT disable_rls_for_real;
-SELECT COUNT(*) FROM test_table;
- count 
--------
-     4
-(1 row)
-
-COMMIT;
-RESET ROLE;
--- sequential real-time queries should be successfully executed
--- since the queries are sent over the same connection
-BEGIN;
-SET LOCAL citus.multi_shard_modify_mode TO 'sequential';
-SELECT id, pg_advisory_lock(15) FROM test_table ORDER BY 1 DESC;
- id | pg_advisory_lock 
-----+------------------
-  6 | 
-  5 | 
-  4 | 
-  3 | 
-  2 | 
-  1 | 
-(6 rows)
-
-ROLLBACK;
-SET client_min_messages TO DEFAULT;
-alter system set deadlock_timeout TO DEFAULT;
-SELECT pg_reload_conf();
- pg_reload_conf 
-----------------
- t
-(1 row)
-
-BEGIN;
-SET citus.select_opens_transaction_block TO off;
--- This query would self-deadlock if it ran in a distributed transaction
-SELECT id, pg_advisory_lock(15) FROM test_table ORDER BY id;
- id | pg_advisory_lock 
-----+------------------
-  1 | 
-  2 | 
-  3 | 
-  4 | 
-  5 | 
-  6 | 
-(6 rows)
-
-END;
-DROP SCHEMA multi_real_time_transaction CASCADE;
-NOTICE:  drop cascades to 4 other objects
-DETAIL:  drop cascades to table test_table
-drop cascades to table co_test_table
-drop cascades to table ref_test_table
-drop cascades to function insert_row_test(name)
diff --git a/src/test/regress/sql/multi_real_time_transaction.sql b/src/test/regress/sql/multi_real_time_transaction.sql
index 742142dfc..9c172f280 100644
--- a/src/test/regress/sql/multi_real_time_transaction.sql
+++ b/src/test/regress/sql/multi_real_time_transaction.sql
@@ -216,10 +216,11 @@ ROLLBACK;
 -- test propagation of SET LOCAL
 -- gonna need a non-superuser as we'll use RLS to test GUC propagation
 CREATE USER rls_user;
+SELECT run_command_on_workers('CREATE USER rls_user');
+
 GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user;
 GRANT ALL ON ALL TABLES IN SCHEMA multi_real_time_transaction TO rls_user;
 
-SELECT run_command_on_workers('CREATE USER rls_user');
 SELECT run_command_on_workers('GRANT ALL ON SCHEMA multi_real_time_transaction TO rls_user');
 SELECT run_command_on_workers('GRANT ALL ON ALL TABLES IN SCHEMA multi_real_time_transaction TO rls_user');