diff --git a/src/test/regress/expected/metadata_sync_from_non_maindb.out b/src/test/regress/expected/metadata_sync_from_non_maindb.out
index e06ea7483..26b7f6d7d 100644
--- a/src/test/regress/expected/metadata_sync_from_non_maindb.out
+++ b/src/test/regress/expected/metadata_sync_from_non_maindb.out
@@ -9,9 +9,9 @@ SHOW citus.main_db;
  regression
 (1 row)
 
-CREATE USER grant_role2pc_user1;
-CREATE USER grant_role2pc_user2;
-CREATE USER grant_role2pc_user3;
+CREATE USER "grant_role2pc'_user1";
+CREATE USER "grant_role2pc'_user2";
+CREATE USER "grant_role2pc'_user3";
 CREATE USER grant_role2pc_user4;
 CREATE USER grant_role2pc_user5;
 \c regression
@@ -22,8 +22,8 @@ select 1 from citus_remove_node('localhost', :worker_2_port);
 (1 row)
 
 \c metadata_sync_2pc_db
-grant grant_role2pc_user1,grant_role2pc_user2 to grant_role2pc_user3 WITH ADMIN OPTION;
-grant grant_role2pc_user1,grant_role2pc_user2 to grant_role2pc_user4,grant_role2pc_user5 granted by grant_role2pc_user3;
+grant "grant_role2pc'_user1","grant_role2pc'_user2" to "grant_role2pc'_user3" WITH ADMIN OPTION;
+grant "grant_role2pc'_user1","grant_role2pc'_user2" to grant_role2pc_user4,grant_role2pc_user5 granted by "grant_role2pc'_user3";
 \c regression
 select 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
@@ -37,23 +37,23 @@ FROM (
     SELECT member::regrole, roleid::regrole as role, grantor::regrole, admin_option
     FROM pg_auth_members
     WHERE member::regrole::text in
-        ('grant_role2pc_user2','grant_role2pc_user3','grant_role2pc_user4','grant_role2pc_user5')
+        ('grant_role2pc''_user2','grant_role2pc''_user3','grant_role2pc_user4','grant_role2pc_user5')
     order by member::regrole::text
 ) t
 $$);
-                                                                                                                                                                                                                                                                                                                                           result
+                                                                                                                                                                                                                                                        result
 ---------------------------------------------------------------------
- [{"member":"grant_role2pc_user3","role":"grant_role2pc_user1","grantor":"postgres","admin_option":true},{"member":"grant_role2pc_user3","role":"grant_role2pc_user2","grantor":"postgres","admin_option":true},{"member":"grant_role2pc_user4","role":"grant_role2pc_user1","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user4","role":"grant_role2pc_user2","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user5","role":"grant_role2pc_user1","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user5","role":"grant_role2pc_user2","grantor":"grant_role2pc_user3","admin_option":false}]
- [{"member":"grant_role2pc_user3","role":"grant_role2pc_user1","grantor":"postgres","admin_option":true},{"member":"grant_role2pc_user3","role":"grant_role2pc_user2","grantor":"postgres","admin_option":true},{"member":"grant_role2pc_user4","role":"grant_role2pc_user1","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user4","role":"grant_role2pc_user2","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user5","role":"grant_role2pc_user1","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user5","role":"grant_role2pc_user2","grantor":"grant_role2pc_user3","admin_option":false}]
- [{"member":"grant_role2pc_user3","role":"grant_role2pc_user1","grantor":"postgres","admin_option":true},{"member":"grant_role2pc_user3","role":"grant_role2pc_user2","grantor":"postgres","admin_option":true},{"member":"grant_role2pc_user4","role":"grant_role2pc_user1","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user4","role":"grant_role2pc_user2","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user5","role":"grant_role2pc_user1","grantor":"grant_role2pc_user3","admin_option":false},{"member":"grant_role2pc_user5","role":"grant_role2pc_user2","grantor":"grant_role2pc_user3","admin_option":false}]
+ [{"member":"grant_role2pc_user4","role":"\"grant_role2pc'_user1\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user4","role":"\"grant_role2pc'_user2\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user5","role":"\"grant_role2pc'_user1\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user5","role":"\"grant_role2pc'_user2\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false}]
+ [{"member":"grant_role2pc_user4","role":"\"grant_role2pc'_user1\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user4","role":"\"grant_role2pc'_user2\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user5","role":"\"grant_role2pc'_user1\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user5","role":"\"grant_role2pc'_user2\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false}]
+ [{"member":"grant_role2pc_user4","role":"\"grant_role2pc'_user1\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user4","role":"\"grant_role2pc'_user2\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user5","role":"\"grant_role2pc'_user1\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false},{"member":"grant_role2pc_user5","role":"\"grant_role2pc'_user2\"","grantor":"\"grant_role2pc'_user3\"","admin_option":false}]
 (3 rows)
 
 \c metadata_sync_2pc_db
-revoke grant_role2pc_user1,grant_role2pc_user2 from grant_role2pc_user4,grant_role2pc_user5 granted by grant_role2pc_user3;
-revoke admin option for grant_role2pc_user1,grant_role2pc_user2 from grant_role2pc_user3;
-revoke grant_role2pc_user1,grant_role2pc_user2 from grant_role2pc_user3;
+revoke "grant_role2pc'_user1","grant_role2pc'_user2" from grant_role2pc_user4,grant_role2pc_user5 granted by "grant_role2pc'_user3";
+revoke admin option for "grant_role2pc'_user1","grant_role2pc'_user2" from "grant_role2pc'_user3";
+revoke "grant_role2pc'_user1","grant_role2pc'_user2" from "grant_role2pc'_user3";
 \c regression
-drop user grant_role2pc_user1,grant_role2pc_user2,grant_role2pc_user3,grant_role2pc_user4,grant_role2pc_user5;
+drop user "grant_role2pc'_user1","grant_role2pc'_user2","grant_role2pc'_user3",grant_role2pc_user4,grant_role2pc_user5;
 set citus.enable_create_database_propagation to on;
 drop database metadata_sync_2pc_db;
 drop schema metadata_sync_2pc_schema;
diff --git a/src/test/regress/sql/metadata_sync_from_non_maindb.sql b/src/test/regress/sql/metadata_sync_from_non_maindb.sql
index 1030782d3..2d53d35fa 100644
--- a/src/test/regress/sql/metadata_sync_from_non_maindb.sql
+++ b/src/test/regress/sql/metadata_sync_from_non_maindb.sql
@@ -6,9 +6,9 @@ CREATE DATABASE metadata_sync_2pc_db;
 \c metadata_sync_2pc_db
 SHOW citus.main_db;
 
-CREATE USER grant_role2pc_user1;
-CREATE USER grant_role2pc_user2;
-CREATE USER grant_role2pc_user3;
+CREATE USER "grant_role2pc'_user1";
+CREATE USER "grant_role2pc'_user2";
+CREATE USER "grant_role2pc'_user3";
 CREATE USER grant_role2pc_user4;
 CREATE USER grant_role2pc_user5;
 
@@ -16,8 +16,8 @@ CREATE USER grant_role2pc_user5;
 select 1 from citus_remove_node('localhost', :worker_2_port);
 
 \c metadata_sync_2pc_db
-grant grant_role2pc_user1,grant_role2pc_user2 to grant_role2pc_user3 WITH ADMIN OPTION;
-grant grant_role2pc_user1,grant_role2pc_user2 to grant_role2pc_user4,grant_role2pc_user5 granted by grant_role2pc_user3;
+grant "grant_role2pc'_user1","grant_role2pc'_user2" to "grant_role2pc'_user3" WITH ADMIN OPTION;
+grant "grant_role2pc'_user1","grant_role2pc'_user2" to grant_role2pc_user4,grant_role2pc_user5 granted by "grant_role2pc'_user3";
 
 \c regression
 select 1 from citus_add_node('localhost', :worker_2_port);
@@ -28,21 +28,21 @@ FROM (
     SELECT member::regrole, roleid::regrole as role, grantor::regrole, admin_option
     FROM pg_auth_members
     WHERE member::regrole::text in
-        ('grant_role2pc_user2','grant_role2pc_user3','grant_role2pc_user4','grant_role2pc_user5')
+        ('grant_role2pc''_user2','grant_role2pc''_user3','grant_role2pc_user4','grant_role2pc_user5')
     order by member::regrole::text
 ) t
 $$);
 
 \c metadata_sync_2pc_db
-revoke grant_role2pc_user1,grant_role2pc_user2 from grant_role2pc_user4,grant_role2pc_user5 granted by grant_role2pc_user3;
+revoke "grant_role2pc'_user1","grant_role2pc'_user2" from grant_role2pc_user4,grant_role2pc_user5 granted by "grant_role2pc'_user3";
 
-revoke admin option for grant_role2pc_user1,grant_role2pc_user2 from grant_role2pc_user3;
+revoke admin option for "grant_role2pc'_user1","grant_role2pc'_user2" from "grant_role2pc'_user3";
 
-revoke grant_role2pc_user1,grant_role2pc_user2 from grant_role2pc_user3;
+revoke "grant_role2pc'_user1","grant_role2pc'_user2" from "grant_role2pc'_user3";
 
 \c regression
 
-drop user grant_role2pc_user1,grant_role2pc_user2,grant_role2pc_user3,grant_role2pc_user4,grant_role2pc_user5;
+drop user "grant_role2pc'_user1","grant_role2pc'_user2","grant_role2pc'_user3",grant_role2pc_user4,grant_role2pc_user5;
 set citus.enable_create_database_propagation to on;
 drop database metadata_sync_2pc_db;
 drop schema metadata_sync_2pc_schema;