diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate.sql
index 5401aa238..20815da34 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate.sql
@@ -7,7 +7,11 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text COLLATE pg_catalog."default",
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to postgres;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate_msql.sql
index 55f9b7cdf..2de617d6f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate_msql.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/10_plus/create_partition_table_with_collate_msql.sql
@@ -3,7 +3,10 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text,
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+);
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to postgres;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql
index 5401aa238..20815da34 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql
@@ -7,7 +7,11 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text COLLATE pg_catalog."default",
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to postgres;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql
index b0b3a8205..2de617d6f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql
@@ -1,9 +1,12 @@
 CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
 (
     id integer,
-    status text COLLATE pg_catalog."default",
+    status text,
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+);
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to postgres;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json
index 0bb9809d6..809b147da 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json
@@ -1949,7 +1949,7 @@
       "msql_endpoint": "NODE-table.msql",
       "data": {
         "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#",
-        "relowner": "enterprisedb",
+        "relowner": "postgres",
         "relacl": [],
         "description": "partition table",
         "coll_inherits": "[]",
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate.sql
index 158d9a6af..5b100df76 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate.sql
@@ -7,7 +7,11 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text COLLATE pg_catalog."default",
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to enterprisedb;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate_msql.sql
index aa10397bf..67eb01fbc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate_msql.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/10_plus/create_partition_table_with_collate_msql.sql
@@ -3,7 +3,10 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text,
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+);
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to enterprisedb;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql
index 158d9a6af..5b100df76 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql
@@ -7,7 +7,11 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text COLLATE pg_catalog."default",
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+)
+TABLESPACE pg_default;
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to enterprisedb;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql
index aa10397bf..67eb01fbc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql
@@ -3,7 +3,10 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'
     id integer,
     status text,
     arr numeric
-) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops);
+) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops)
+WITH (
+    OIDS = FALSE
+);
 
 ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"
     OWNER to enterprisedb;