diff --git a/src/test/regress/citus_tests/common.py b/src/test/regress/citus_tests/common.py
index a1990203fd0..420ddb5c0f4 100644
--- a/src/test/regress/citus_tests/common.py
+++ b/src/test/regress/citus_tests/common.py
@@ -846,6 +846,8 @@ def initdb(self):
             # happened
             pgconf.write("restart_after_crash = off\n")
 
+            # prevent tests from hanging
+            pgconf.write("statement_timeout= '5min'\n")
         os.truncate(self.hba_path, 0)
         self.ssl_access("all", "trust")
         self.nossl_access("all", "trust")
diff --git a/src/test/regress/expected/global_cancel.out b/src/test/regress/expected/global_cancel.out
index e5ce4fbc620..3687871d6c2 100644
--- a/src/test/regress/expected/global_cancel.out
+++ b/src/test/regress/expected/global_cancel.out
@@ -56,8 +56,8 @@ SELECT global_pid AS maintenance_daemon_gpid
 FROM pg_stat_activity psa JOIN get_all_active_transactions() gaat ON psa.pid = gaat.process_id
 WHERE application_name = 'Citus Maintenance Daemon' \gset
 SET client_min_messages TO ERROR;
-CREATE USER global_cancel_user;
-SELECT 1 FROM run_command_on_workers('CREATE USER global_cancel_user');
+CREATE USER global_cancel_user NOSUPERUSER ;
+SELECT 1 FROM run_command_on_workers('CREATE USER global_cancel_user NOSUPERUSER ;');
  ?column?
 ---------------------------------------------------------------------
         1
@@ -66,6 +66,12 @@ SELECT 1 FROM run_command_on_workers('CREATE USER global_cancel_user');
 
 RESET client_min_messages;
 \c - global_cancel_user - :master_port
+SELECT current_user;
+    current_user
+---------------------------------------------------------------------
+ global_cancel_user
+(1 row)
+
 SELECT pg_typeof(:maintenance_daemon_gpid);
  pg_typeof
 ---------------------------------------------------------------------
diff --git a/src/test/regress/sql/global_cancel.sql b/src/test/regress/sql/global_cancel.sql
index 12330baf235..2288cd8b577 100644
--- a/src/test/regress/sql/global_cancel.sql
+++ b/src/test/regress/sql/global_cancel.sql
@@ -39,11 +39,12 @@ FROM pg_stat_activity psa JOIN get_all_active_transactions() gaat ON psa.pid = g
 WHERE application_name = 'Citus Maintenance Daemon' \gset
 
 SET client_min_messages TO ERROR;
-CREATE USER global_cancel_user;
-SELECT 1 FROM run_command_on_workers('CREATE USER global_cancel_user');
+CREATE USER global_cancel_user NOSUPERUSER ;
+SELECT 1 FROM run_command_on_workers('CREATE USER global_cancel_user NOSUPERUSER ;');
 RESET client_min_messages;
 
 \c - global_cancel_user - :master_port
+SELECT current_user;
 
 SELECT pg_typeof(:maintenance_daemon_gpid);