diff --git a/src/test/regress/expected/grant_on_database_propagation_from_non_maindb.out b/src/test/regress/expected/grant_on_database_propagation_from_non_maindb.out
index b2aa4c6f2..d3dccfdad 100644
--- a/src/test/regress/expected/grant_on_database_propagation_from_non_maindb.out
+++ b/src/test/regress/expected/grant_on_database_propagation_from_non_maindb.out
@@ -13,11 +13,11 @@ revoke connect,temp,temporary  on database test_2pc_db from public;
 CREATE SCHEMA grant_on_database_propagation;
 SET search_path TO grant_on_database_propagation;
 -- test grant/revoke CREATE privilege propagation on database
-create user myuser;
+create user "myuser'_test";
 \c test_2pc_db - - :master_port
-grant create on database test_2pc_db to myuser;
+grant create on database test_2pc_db to "myuser'_test";
 \c regression - - :master_port;
-select check_database_privileges('myuser','test_2pc_db',ARRAY['CREATE']);
+select check_database_privileges('myuser''_test','test_2pc_db',ARRAY['CREATE']);
  check_database_privileges
 ---------------------------------------------------------------------
  (CREATE,t)
@@ -26,9 +26,9 @@ select check_database_privileges('myuser','test_2pc_db',ARRAY['CREATE']);
 (3 rows)
 
 \c test_2pc_db - - :master_port
-revoke create on database test_2pc_db from myuser;
+revoke create on database test_2pc_db from "myuser'_test";
 \c regression - - :master_port;
-select check_database_privileges('myuser','test_2pc_db',ARRAY['CREATE']);
+select check_database_privileges('myuser''_test','test_2pc_db',ARRAY['CREATE']);
  check_database_privileges
 ---------------------------------------------------------------------
  (CREATE,f)
@@ -36,7 +36,7 @@ select check_database_privileges('myuser','test_2pc_db',ARRAY['CREATE']);
  (CREATE,f)
 (3 rows)
 
-drop user myuser;
+drop user "myuser'_test";
 ---------------------------------------------------------------------
 -- test grant/revoke CONNECT privilege propagation on database
 \c regression - - :master_port
@@ -214,7 +214,7 @@ create user myuser_1;
 \c test_2pc_db - - :master_port
 grant CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db to myuser7;
 set role myuser7;
---here since myuser does not have grant option, it should fail
+--here since myuser7 does not have grant option, it should fail
 grant CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db to myuser_1;
 WARNING:  no privileges were granted for "test_2pc_db"
 \c regression - - :master_port
@@ -271,7 +271,7 @@ ERROR:  dependent privileges exist
 HINT:  Use CASCADE to revoke them too.
 --below test should succeed and should not throw any error since myuser_1 privileges are revoked with cascade
 revoke grant option for CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db from myuser7 cascade ;
---here we test if myuser still have the privileges after revoke grant option for
+--here we test if myuser7 still have the privileges after revoke grant option for
 \c regression - - :master_port
 select check_database_privileges('myuser7','test_2pc_db',ARRAY['CREATE', 'CONNECT', 'TEMP', 'TEMPORARY']);
  check_database_privileges
diff --git a/src/test/regress/sql/grant_on_database_propagation_from_non_maindb.sql b/src/test/regress/sql/grant_on_database_propagation_from_non_maindb.sql
index 9e025a8c8..55845f011 100644
--- a/src/test/regress/sql/grant_on_database_propagation_from_non_maindb.sql
+++ b/src/test/regress/sql/grant_on_database_propagation_from_non_maindb.sql
@@ -15,22 +15,22 @@ SET search_path TO grant_on_database_propagation;
 
 
 -- test grant/revoke CREATE privilege propagation on database
-create user myuser;
+create user "myuser'_test";
 
 
 \c test_2pc_db - - :master_port
-grant create on database test_2pc_db to myuser;
+grant create on database test_2pc_db to "myuser'_test";
 
 \c regression - - :master_port;
-select check_database_privileges('myuser','test_2pc_db',ARRAY['CREATE']);
+select check_database_privileges('myuser''_test','test_2pc_db',ARRAY['CREATE']);
 
 \c test_2pc_db - - :master_port
-revoke create on database test_2pc_db from myuser;
+revoke create on database test_2pc_db from "myuser'_test";
 
 \c regression - - :master_port;
-select check_database_privileges('myuser','test_2pc_db',ARRAY['CREATE']);
+select check_database_privileges('myuser''_test','test_2pc_db',ARRAY['CREATE']);
 
-drop user myuser;
+drop user "myuser'_test";
 -----------------------------------------------------------------------
 
 -- test grant/revoke CONNECT privilege propagation on database
@@ -140,7 +140,7 @@ create user myuser_1;
 grant CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db to myuser7;
 
 set role myuser7;
---here since myuser does not have grant option, it should fail
+--here since myuser7 does not have grant option, it should fail
 grant CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db to myuser_1;
 
 \c regression - - :master_port
@@ -171,7 +171,7 @@ revoke grant option for CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db fr
 --below test should succeed and should not throw any error since myuser_1 privileges are revoked with cascade
 revoke grant option for CREATE,CONNECT,TEMP,TEMPORARY on database test_2pc_db from myuser7 cascade ;
 
---here we test if myuser still have the privileges after revoke grant option for
+--here we test if myuser7 still have the privileges after revoke grant option for
 
 \c regression - - :master_port
 select check_database_privileges('myuser7','test_2pc_db',ARRAY['CREATE', 'CONNECT', 'TEMP', 'TEMPORARY']);