diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.sql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.sql
index c774cbf5f..2a053a53f 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.sql
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.sql
@@ -1,8 +1,8 @@
--- RESOURCE GROUP: new_test_resql_resource_group
+-- RESOURCE GROUP: Rg2_$%{}[]()&*^!@"'`\/#
 
--- DROP RESOURCE GROUP new_test_resql_resource_group
+-- DROP RESOURCE GROUP "Rg2_$%{}[]()&*^!@""'`\/#"
 
-CREATE RESOURCE GROUP new_test_resql_resource_group;
+CREATE RESOURCE GROUP "Rg2_$%{}[]()&*^!@""'`\/#";
 
-ALTER RESOURCE GROUP new_test_resql_resource_group
+ALTER RESOURCE GROUP "Rg2_$%{}[]()&*^!@""'`\/#"
     SET cpu_rate_limit = 0, dirty_rate_limit = 0;
diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.sql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.sql
index fb21309d7..d64aea6ab 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.sql
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.sql
@@ -1,8 +1,8 @@
--- RESOURCE GROUP: new_test_resql_resource_group
+-- RESOURCE GROUP: Rg2_$%{}[]()&*^!@"'`\/#
 
--- DROP RESOURCE GROUP new_test_resql_resource_group
+-- DROP RESOURCE GROUP "Rg2_$%{}[]()&*^!@""'`\/#"
 
-CREATE RESOURCE GROUP new_test_resql_resource_group;
+CREATE RESOURCE GROUP "Rg2_$%{}[]()&*^!@""'`\/#";
 
-ALTER RESOURCE GROUP new_test_resql_resource_group
+ALTER RESOURCE GROUP "Rg2_$%{}[]()&*^!@""'`\/#"
     SET cpu_rate_limit = 1, dirty_rate_limit = 5;
diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.sql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.sql
index 3eb35a6a8..a0f5f191c 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.sql
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.sql
@@ -1,8 +1,8 @@
--- RESOURCE GROUP: test_resql_resource_group
+-- RESOURCE GROUP: Rg1_$%{}[]()&*^!@"'`\/#
 
--- DROP RESOURCE GROUP test_resql_resource_group
+-- DROP RESOURCE GROUP "Rg1_$%{}[]()&*^!@""'`\/#"
 
-CREATE RESOURCE GROUP test_resql_resource_group;
+CREATE RESOURCE GROUP "Rg1_$%{}[]()&*^!@""'`\/#";
 
-ALTER RESOURCE GROUP test_resql_resource_group
+ALTER RESOURCE GROUP "Rg1_$%{}[]()&*^!@""'`\/#"
     SET cpu_rate_limit = 0, dirty_rate_limit = 0;
diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/test.json b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/test.json
index 312eb3df4..473331b6e 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/test.json
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/test.json
@@ -6,7 +6,7 @@
       "endpoint": "NODE-resource_group.obj",
       "sql_endpoint": "NODE-resource_group.sql_id",
       "data": {
-          "name": "test_resql_resource_group",
+          "name": "Rg1_$%{}[]()&*^!@\"'`\\/#",
           "cpu_rate_limit": 0,
           "dirty_rate_limit": 0
       },
@@ -18,7 +18,7 @@
       "endpoint": "NODE-resource_group.obj_id",
       "sql_endpoint": "NODE-resource_group.sql_id",
       "data": {
-        "name": "new_test_resql_resource_group"
+        "name": "Rg2_$%{}[]()&*^!@\"'`\\/#"
       },
       "expected_sql_file": "alter_resource_group_name.sql"
     },
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_description.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_description.sql
index 7879f300c..ff2e66206 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_description.sql
@@ -1,7 +1,7 @@
--- Role: test_resql_role_pg91
--- DROP ROLE test_resql_role_pg91;
+-- Role: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE test_resql_role_pg91 WITH
+CREATE ROLE "Role1_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   NOSUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE ROLE test_resql_role_pg91 WITH
   NOCREATEROLE
   NOREPLICATION;
 
-COMMENT ON ROLE test_resql_role_pg91 IS 'This is detailed description';
+COMMENT ON ROLE "Role1_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_name.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_name.sql
index 3122bd022..5c757fc93 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_name.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_name.sql
@@ -1,7 +1,7 @@
--- Role: new_test_resql_role_pg91
--- DROP ROLE new_test_resql_role_pg91;
+-- Role: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE new_test_resql_role_pg91 WITH
+CREATE ROLE "Role2_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   NOSUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE ROLE new_test_resql_role_pg91 WITH
   NOCREATEROLE
   NOREPLICATION;
 
-COMMENT ON ROLE new_test_resql_role_pg91 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_options.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_options.sql
index 8d205ec69..2fbe32369 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_options.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_role_options.sql
@@ -1,7 +1,7 @@
--- Role: new_test_resql_role_pg91
--- DROP ROLE new_test_resql_role_pg91;
+-- Role: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE new_test_resql_role_pg91 WITH
+CREATE ROLE "Role2_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   SUPERUSER
   INHERIT
@@ -10,6 +10,6 @@ CREATE ROLE new_test_resql_role_pg91 WITH
   NOREPLICATION;
 
 
-UPDATE pg_authid SET rolcatupdate=false WHERE rolname = new_test_resql_role_pg91;
+UPDATE pg_authid SET rolcatupdate=false WHERE rolname = 'Role2_$%{}[]()&*^!@"''`\/#';
 
-COMMENT ON ROLE new_test_resql_role_pg91 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_description.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_description.sql
index e34aa4372..df1af0fb8 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_description.sql
@@ -1,7 +1,7 @@
--- User: test_resql_user_pg91
--- DROP USER test_resql_user_pg91;
+-- User: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER test_resql_user_pg91 WITH
+CREATE USER "Role1_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   SUPERUSER
   INHERIT
@@ -10,6 +10,6 @@ CREATE USER test_resql_user_pg91 WITH
   REPLICATION;
 
 
-UPDATE pg_authid SET rolcatupdate=false WHERE rolname = test_resql_user_pg91;
+UPDATE pg_authid SET rolcatupdate=false WHERE rolname = 'Role1_$%{}[]()&*^!@"''`\/#';
 
-COMMENT ON ROLE test_resql_user_pg91 IS 'This is detailed description';
+COMMENT ON ROLE "Role1_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_name.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_name.sql
index 0f1078d44..51af5cf92 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_name.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_name.sql
@@ -1,7 +1,7 @@
--- User: new_test_resql_user_pg91
--- DROP USER new_test_resql_user_pg91;
+-- User: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER new_test_resql_user_pg91 WITH
+CREATE USER "Role2_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   SUPERUSER
   INHERIT
@@ -10,6 +10,6 @@ CREATE USER new_test_resql_user_pg91 WITH
   REPLICATION;
 
 
-UPDATE pg_authid SET rolcatupdate=false WHERE rolname = new_test_resql_user_pg91;
+UPDATE pg_authid SET rolcatupdate=false WHERE rolname = 'Role2_$%{}[]()&*^!@"''`\/#'';
 
-COMMENT ON ROLE new_test_resql_user_pg91 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_options.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_options.sql
index 8e6e636a7..5bba7aebb 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_options.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/alter_user_options.sql
@@ -1,7 +1,7 @@
--- User: new_test_resql_user_pg91
--- DROP USER new_test_resql_user_pg91;
+-- User: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER new_test_resql_user_pg91 WITH
+CREATE USER "Role2_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   NOSUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE USER new_test_resql_user_pg91 WITH
   CREATEROLE
   REPLICATION;
 
-COMMENT ON ROLE new_test_resql_user_pg91 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_role.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_role.sql
index 7f9bf63d6..7b922588e 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_role.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_role.sql
@@ -1,7 +1,7 @@
--- Role: test_resql_role_pg91
--- DROP ROLE test_resql_role_pg91;
+-- Role: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE test_resql_role_pg91 WITH
+CREATE ROLE "Role1_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   NOSUPERUSER
   INHERIT
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_user.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_user.sql
index 12da84a17..ddf866688 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_user.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/create_user.sql
@@ -1,7 +1,7 @@
--- User: test_resql_user_pg91
--- DROP USER test_resql_user_pg91;
+-- User: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER test_resql_user_pg91 WITH
+CREATE USER "Role1_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   SUPERUSER
   INHERIT
@@ -10,4 +10,4 @@ CREATE USER test_resql_user_pg91 WITH
   REPLICATION;
 
 
-UPDATE pg_authid SET rolcatupdate=false WHERE rolname = test_resql_user_pg91;
+UPDATE pg_authid SET rolcatupdate=false WHERE rolname = 'Role1_$%{}[]()&*^!@"''`\/#'';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/test.json b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/test.json
index 0e8c69940..c02159d4a 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/test.json
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.1_plus/test.json
@@ -6,7 +6,7 @@
       "endpoint": "NODE-role.obj",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-          "rolname": "test_resql_role_pg91",
+          "rolname": "Role1_$%{}[]()&*^!@\"'`\\/#",
           "rolcanlogin": false,
           "rolpassword": null,
           "rolconnlimit": -1,
@@ -39,7 +39,7 @@
       "endpoint": "NODE-role.obj_id",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-        "rolname": "new_test_resql_role_pg91"
+        "rolname": "Role2_$%{}[]()&*^!@\"'`\\/#"
       },
       "expected_sql_file": "alter_role_name.sql"
     },
@@ -66,7 +66,7 @@
       "endpoint": "NODE-role.obj",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-          "rolname": "test_resql_user_pg91",
+          "rolname": "Role1_$%{}[]()&*^!@\"'`\\/#",
           "rolcanlogin": true,
           "rolpassword": null,
           "rolconnlimit": -1,
@@ -99,7 +99,7 @@
       "endpoint": "NODE-role.obj_id",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-        "rolname": "new_test_resql_user_pg91"
+        "rolname": "Role2_$%{}[]()&*^!@\"'`\\/#"
       },
       "expected_sql_file": "alter_user_name.sql"
     },
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_description.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_description.sql
index 7be339864..ff2e66206 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_description.sql
@@ -1,7 +1,7 @@
--- Role: test_resql_role_pg95
--- DROP ROLE test_resql_role_pg95;
+-- Role: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE test_resql_role_pg95 WITH
+CREATE ROLE "Role1_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   NOSUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE ROLE test_resql_role_pg95 WITH
   NOCREATEROLE
   NOREPLICATION;
 
-COMMENT ON ROLE test_resql_role_pg95 IS 'This is detailed description';
+COMMENT ON ROLE "Role1_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_name.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_name.sql
index 563404c76..5c757fc93 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_name.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_name.sql
@@ -1,7 +1,7 @@
--- Role: new_test_resql_role_pg95
--- DROP ROLE new_test_resql_role_pg95;
+-- Role: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE new_test_resql_role_pg95 WITH
+CREATE ROLE "Role2_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   NOSUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE ROLE new_test_resql_role_pg95 WITH
   NOCREATEROLE
   NOREPLICATION;
 
-COMMENT ON ROLE new_test_resql_role_pg95 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_options.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_options.sql
index 980bad230..6ba594ade 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_options.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_role_options.sql
@@ -1,7 +1,7 @@
--- Role: new_test_resql_role_pg95
--- DROP ROLE new_test_resql_role_pg95;
+-- Role: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE new_test_resql_role_pg95 WITH
+CREATE ROLE "Role2_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   SUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE ROLE new_test_resql_role_pg95 WITH
   NOCREATEROLE
   NOREPLICATION;
 
-COMMENT ON ROLE new_test_resql_role_pg95 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_description.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_description.sql
index 2eed60257..097dca111 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_description.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_description.sql
@@ -1,7 +1,7 @@
--- User: test_resql_user_pg95
--- DROP USER test_resql_user_pg95;
+-- User: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER test_resql_user_pg95 WITH
+CREATE USER "Role1_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   SUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE USER test_resql_user_pg95 WITH
   CREATEROLE
   REPLICATION;
 
-COMMENT ON ROLE test_resql_user_pg95 IS 'This is detailed description';
+COMMENT ON ROLE "Role1_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_name.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_name.sql
index 07454a798..5821a2f87 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_name.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_name.sql
@@ -1,7 +1,7 @@
--- User: new_test_resql_user_pg95
--- DROP USER new_test_resql_user_pg95;
+-- User: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER new_test_resql_user_pg95 WITH
+CREATE USER "Role2_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   SUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE USER new_test_resql_user_pg95 WITH
   CREATEROLE
   REPLICATION;
 
-COMMENT ON ROLE new_test_resql_user_pg95 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_options.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_options.sql
index 5035fbb91..5bba7aebb 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_options.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/alter_user_options.sql
@@ -1,7 +1,7 @@
--- User: new_test_resql_user_pg95
--- DROP USER new_test_resql_user_pg95;
+-- User: "Role2_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role2_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER new_test_resql_user_pg95 WITH
+CREATE USER "Role2_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   NOSUPERUSER
   INHERIT
@@ -9,4 +9,4 @@ CREATE USER new_test_resql_user_pg95 WITH
   CREATEROLE
   REPLICATION;
 
-COMMENT ON ROLE new_test_resql_user_pg95 IS 'This is detailed description';
+COMMENT ON ROLE "Role2_$%{}[]()&*^!@""'`\/#" IS 'This is detailed description';
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_role.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_role.sql
index 512164772..7b922588e 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_role.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_role.sql
@@ -1,7 +1,7 @@
--- Role: test_resql_role_pg95
--- DROP ROLE test_resql_role_pg95;
+-- Role: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP ROLE "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE ROLE test_resql_role_pg95 WITH
+CREATE ROLE "Role1_$%{}[]()&*^!@""'`\/#" WITH
   NOLOGIN
   NOSUPERUSER
   INHERIT
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_user.sql b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_user.sql
index 476384fba..625a6cdd8 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_user.sql
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/create_user.sql
@@ -1,7 +1,7 @@
--- User: test_resql_user_pg95
--- DROP USER test_resql_user_pg95;
+-- User: "Role1_$%{}[]()&*^!@""'`\/#"
+-- DROP USER "Role1_$%{}[]()&*^!@""'`\/#";
 
-CREATE USER test_resql_user_pg95 WITH
+CREATE USER "Role1_$%{}[]()&*^!@""'`\/#" WITH
   LOGIN
   SUPERUSER
   INHERIT
diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json
index e902b3ee8..c02159d4a 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json
+++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json
@@ -6,7 +6,7 @@
       "endpoint": "NODE-role.obj",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-          "rolname": "test_resql_role_pg95",
+          "rolname": "Role1_$%{}[]()&*^!@\"'`\\/#",
           "rolcanlogin": false,
           "rolpassword": null,
           "rolconnlimit": -1,
@@ -39,7 +39,7 @@
       "endpoint": "NODE-role.obj_id",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-        "rolname": "new_test_resql_role_pg95"
+        "rolname": "Role2_$%{}[]()&*^!@\"'`\\/#"
       },
       "expected_sql_file": "alter_role_name.sql"
     },
@@ -66,7 +66,7 @@
       "endpoint": "NODE-role.obj",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-          "rolname": "test_resql_user_pg95",
+          "rolname": "Role1_$%{}[]()&*^!@\"'`\\/#",
           "rolcanlogin": true,
           "rolpassword": null,
           "rolconnlimit": -1,
@@ -99,7 +99,7 @@
       "endpoint": "NODE-role.obj_id",
       "sql_endpoint": "NODE-role.sql_id",
       "data": {
-        "rolname": "new_test_resql_user_pg95"
+        "rolname": "Role2_$%{}[]()&*^!@\"'`\\/#"
       },
       "expected_sql_file": "alter_user_name.sql"
     },