diff --git a/src/test/regress/expected/comment_on_role.out b/src/test/regress/expected/comment_on_role.out
index 62f308c90..6382fdec1 100644
--- a/src/test/regress/expected/comment_on_role.out
+++ b/src/test/regress/expected/comment_on_role.out
@@ -1,13 +1,13 @@
 set citus.log_remote_commands to on;
 set citus.grep_remote_commands to 'COMMENT ON ROLE';
-create role role1;
-comment on ROLE role1 is 'test-comment';
+create role "role1-\!escape";
+comment on ROLE "role1-\!escape" is 'test-comment';
 SELECT result FROM run_command_on_all_nodes(
   $$
     SELECT ds.description AS role_comment
     FROM pg_roles r
     LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
-    WHERE r.rolname = 'role1';
+    WHERE r.rolname = 'role1-\!escape';
   $$
 );
     result
@@ -17,13 +17,13 @@ SELECT result FROM run_command_on_all_nodes(
  test-comment
 (3 rows)
 
-comment on role role1 is 'comment-needs\!escape';
+comment on role "role1-\!escape" is 'comment-needs\!escape';
 SELECT result FROM run_command_on_all_nodes(
   $$
     SELECT ds.description AS role_comment
     FROM pg_roles r
     LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
-    WHERE r.rolname = 'role1';
+    WHERE r.rolname = 'role1-\!escape';
   $$
 );
         result
@@ -33,13 +33,13 @@ SELECT result FROM run_command_on_all_nodes(
  comment-needs\!escape
 (3 rows)
 
-comment on role role1 is NULL;
+comment on role "role1-\!escape" is NULL;
 SELECT result FROM run_command_on_all_nodes(
   $$
     SELECT ds.description AS role_comment
     FROM pg_roles r
     LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
-    WHERE r.rolname = 'role1';
+    WHERE r.rolname = 'role1-\!escape';
   $$
 );
  result
@@ -49,6 +49,6 @@ SELECT result FROM run_command_on_all_nodes(
 
 (3 rows)
 
-drop role role1;
+drop role "role1-\!escape";
 reset citus.grep_remote_commands;
 reset citus.log_remote_commands;
diff --git a/src/test/regress/sql/comment_on_role.sql b/src/test/regress/sql/comment_on_role.sql
index 30e050aa0..9aeae662b 100644
--- a/src/test/regress/sql/comment_on_role.sql
+++ b/src/test/regress/sql/comment_on_role.sql
@@ -2,41 +2,41 @@ set citus.log_remote_commands to on;
 
 set citus.grep_remote_commands to 'COMMENT ON ROLE';
 
-create role role1;
+create role "role1-\!escape";
 
-comment on ROLE role1 is 'test-comment';
+comment on ROLE "role1-\!escape" is 'test-comment';
 
 SELECT result FROM run_command_on_all_nodes(
   $$
     SELECT ds.description AS role_comment
     FROM pg_roles r
     LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
-    WHERE r.rolname = 'role1';
+    WHERE r.rolname = 'role1-\!escape';
   $$
 );
 
-comment on role role1 is 'comment-needs\!escape';
+comment on role "role1-\!escape" is 'comment-needs\!escape';
 
 SELECT result FROM run_command_on_all_nodes(
   $$
     SELECT ds.description AS role_comment
     FROM pg_roles r
     LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
-    WHERE r.rolname = 'role1';
+    WHERE r.rolname = 'role1-\!escape';
   $$
 );
 
-comment on role role1 is NULL;
+comment on role "role1-\!escape" is NULL;
 
 SELECT result FROM run_command_on_all_nodes(
   $$
     SELECT ds.description AS role_comment
     FROM pg_roles r
     LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
-    WHERE r.rolname = 'role1';
+    WHERE r.rolname = 'role1-\!escape';
   $$
 );
 
-drop role role1;
+drop role "role1-\!escape";
 reset citus.grep_remote_commands;
 reset citus.log_remote_commands;