diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/alter_package_headers_and_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/alter_package_headers_and_comment.sql
new file mode 100644
index 00000000..4a8f6723
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/alter_package_headers_and_comment.sql
@@ -0,0 +1,12 @@
+-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+
+-- DROP PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+IS
+PROCEDURE get_name(p_empno numeric);
+END "pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+
+COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+    IS 'test comment updated';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/create_package_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/create_package_with_all_options.sql
new file mode 100644
index 00000000..36982f95
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/create_package_with_all_options.sql
@@ -0,0 +1,17 @@
+-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+
+-- DROP PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+IS
+FUNCTION func1(v1 integer) RETURN integer;
+END "pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+
+CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+IS
+FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10;END FUNC1;
+END "pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+    IS 'test comment';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/test.json
new file mode 100644
index 00000000..64906b3b
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/10_plus/test.json
@@ -0,0 +1,43 @@
+{
+  "scenarios": [
+    {
+      "type": "create",
+      "name": "Create Packages",
+      "endpoint": "NODE-package.obj",
+      "sql_endpoint": "NODE-package.sql_id",
+      "data":
+      {
+        "name": "pkg_emp_$%{}[]()&*^!@\"'`\\/#",
+        "description": "test comment",
+        "owner": "enterprisedb",
+        "pkgacl": [{
+          "grantee": "aq_administrator_role",
+          "grantor": "enterprisedb",
+          "privileges": [{
+            "privilege_type": "X",
+            "privilege": true,
+            "with_grant": true
+          }]
+        }],
+        "pkgbodysrc": "FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10;END FUNC1;",
+        "pkgheadsrc": "FUNCTION func1(v1 integer) RETURN integer;",
+        "schema": "public"
+      },
+      "expected_sql_file": "create_package_with_all_options.sql"
+    },
+    {
+      "type": "alter",
+      "name": "Alter Packages",
+      "endpoint": "NODE-package.obj_id",
+      "sql_endpoint": "NODE-package.sql_id",
+      "data":
+      {
+        "description": "test comment updated",
+        "owner": "enterprisedb",
+        "pkgheadsrc": "PROCEDURE get_name(p_empno numeric);",
+        "schema": "public"
+      },
+      "expected_sql_file": "alter_package_headers_and_comment.sql"
+    }
+  ]
+}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/alter_package_headers_and_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/alter_package_headers_and_comment.sql
new file mode 100644
index 00000000..4a8f6723
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/alter_package_headers_and_comment.sql
@@ -0,0 +1,12 @@
+-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+
+-- DROP PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+IS
+PROCEDURE get_name(p_empno numeric);
+END "pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+
+COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+    IS 'test comment updated';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/create_package_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/create_package_with_all_options.sql
new file mode 100644
index 00000000..ed693aed
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/create_package_with_all_options.sql
@@ -0,0 +1,17 @@
+-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+
+-- DROP PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+IS
+FUNCTION func1(v1 integer) RETURN integer;
+END "pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+
+CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+IS
+FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10;END;
+END "pkg_emp_$%{}[]()&*^!@""'`\/#";
+
+COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"
+    IS 'test comment';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/test.json
new file mode 100644
index 00000000..2d4ebe69
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/9.2_plus/test.json
@@ -0,0 +1,44 @@
+{
+  "scenarios": [
+    {
+      "type": "create",
+      "name": "Create Packages",
+      "endpoint": "NODE-package.obj",
+      "sql_endpoint": "NODE-package.sql_id",
+      "data":
+      {
+        "name": "pkg_emp_$%{}[]()&*^!@\"'`\\/#",
+        "description": "test comment",
+        "owner": "enterprisedb",
+        "pkgacl": [{
+          "grantee": "aq_administrator_role",
+          "grantor": "enterprisedb",
+          "privileges": [{
+            "privilege_type": "X",
+            "privilege": true,
+            "with_grant": true
+          }]
+        }],
+        "pkgbodysrc": "FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10;END FUNC1;",
+        "pkgheadsrc": "FUNCTION func1(v1 integer) RETURN integer;",
+        "schema": "public"
+      },
+      "expected_sql_file": "create_package_with_all_options.sql"
+    },
+    {
+      "type": "alter",
+      "name": "Alter Packages",
+      "endpoint": "NODE-package.obj_id",
+      "sql_endpoint": "NODE-package.sql_id",
+      "data":
+      {
+        "description": "test comment updated",
+        "owner": "enterprisedb",
+        "pkgheadsrc": "PROCEDURE get_name(p_empno numeric);",
+        "pkgbodysrc": "PROCEDURE get_name(p_empno numeric);",
+        "schema": "public"
+      },
+      "expected_sql_file": "alter_package_headers_and_comment.sql"
+    }
+  ]
+}