diff --git a/src/test/regress/expected/columnar_permissions.out b/src/test/regress/expected/columnar_permissions.out
index cbbd3c481..5749a7458 100644
--- a/src/test/regress/expected/columnar_permissions.out
+++ b/src/test/regress/expected/columnar_permissions.out
@@ -4,6 +4,7 @@ insert into no_access values(2);
 insert into no_access values(3);
 select current_user \gset
 create user columnar_user;
+GRANT CREATE ON SCHEMA public TO columnar_user;
 \c - columnar_user
 -- owned by columnar_user
 create table columnar_permissions(i int) using columnar;
diff --git a/src/test/regress/expected/multi_multiuser_auth.out b/src/test/regress/expected/multi_multiuser_auth.out
index dcbc49fee..15d34b563 100644
--- a/src/test/regress/expected/multi_multiuser_auth.out
+++ b/src/test/regress/expected/multi_multiuser_auth.out
@@ -155,6 +155,7 @@ SELECT COUNT(*) FROM wonderland;
 (1 row)
 
 DROP TABLE wonderland;
+GRANT CREATE ON SCHEMA public TO bob;
 \c :bob_conninfo
 -- bob can't change authinfo: not a superuser
 DELETE FROM pg_dist_authinfo WHERE rolename = 'bob';
diff --git a/src/test/regress/expected/multi_multiuser_master_protocol.out b/src/test/regress/expected/multi_multiuser_master_protocol.out
index b0d90a6c5..e547363ae 100644
--- a/src/test/regress/expected/multi_multiuser_master_protocol.out
+++ b/src/test/regress/expected/multi_multiuser_master_protocol.out
@@ -161,6 +161,7 @@ SELECT master_create_distributed_table('trivial_postgres', 'id', 'append');
 (1 row)
 
 GRANT ALL ON trivial_postgres TO full_access;
+GRANT CREATE ON SCHEMA public TO full_access;
 SET ROLE full_access;
 CREATE TABLE trivial_full_access (id int);
 SELECT master_create_distributed_table('trivial_full_access', 'id', 'append');
diff --git a/src/test/regress/spec/isolation_multiuser_locking.spec b/src/test/regress/spec/isolation_multiuser_locking.spec
index 5891ca622..2d5c1cc03 100644
--- a/src/test/regress/spec/isolation_multiuser_locking.spec
+++ b/src/test/regress/spec/isolation_multiuser_locking.spec
@@ -7,6 +7,8 @@ setup
 
 	CREATE USER test_user_2;
 
+	GRANT CREATE ON SCHEMA public TO test_user_1, test_user_2;
+
 	CREATE TABLE test_table(column1 int, column2 int);
 	ALTER TABLE test_table OWNER TO test_user_1;
 	SELECT create_distributed_table('test_table', 'column1');
@@ -16,6 +18,7 @@ teardown
 {
 	BEGIN;
 	DROP TABLE IF EXISTS test_table;
+	REVOKE CREATE ON SCHEMA public FROM test_user_1, test_user_2;
 	DROP USER test_user_1, test_user_2;
 	COMMIT;
 }
diff --git a/src/test/regress/sql/columnar_permissions.sql b/src/test/regress/sql/columnar_permissions.sql
index aca0fd5c7..4f7c6cb27 100644
--- a/src/test/regress/sql/columnar_permissions.sql
+++ b/src/test/regress/sql/columnar_permissions.sql
@@ -9,6 +9,8 @@ select current_user \gset
 
 create user columnar_user;
 
+GRANT CREATE ON SCHEMA public TO columnar_user;
+
 \c - columnar_user
 
 -- owned by columnar_user
diff --git a/src/test/regress/sql/multi_multiuser_auth.sql b/src/test/regress/sql/multi_multiuser_auth.sql
index 2d9681f9b..43cb3c11f 100644
--- a/src/test/regress/sql/multi_multiuser_auth.sql
+++ b/src/test/regress/sql/multi_multiuser_auth.sql
@@ -135,6 +135,8 @@ SELECT COUNT(*) FROM wonderland;
 
 DROP TABLE wonderland;
 
+GRANT CREATE ON SCHEMA public TO bob;
+
 \c :bob_conninfo
 
 -- bob can't change authinfo: not a superuser
diff --git a/src/test/regress/sql/multi_multiuser_master_protocol.sql b/src/test/regress/sql/multi_multiuser_master_protocol.sql
index 89e3645b4..3a9513985 100644
--- a/src/test/regress/sql/multi_multiuser_master_protocol.sql
+++ b/src/test/regress/sql/multi_multiuser_master_protocol.sql
@@ -43,6 +43,8 @@ CREATE TABLE trivial_postgres (id int);
 SELECT master_create_distributed_table('trivial_postgres', 'id', 'append');
 GRANT ALL ON trivial_postgres TO full_access;
 
+GRANT CREATE ON SCHEMA public TO full_access;
+
 SET ROLE full_access;
 CREATE TABLE trivial_full_access (id int);
 SELECT master_create_distributed_table('trivial_full_access', 'id', 'append');