diff --git a/src/test/regress/create_schedule b/src/test/regress/create_schedule
index 3da31fde9..c0967a29d 100644
--- a/src/test/regress/create_schedule
+++ b/src/test/regress/create_schedule
@@ -4,6 +4,7 @@ test: dropped_columns_create_load distributed_planning_create_load
 test: local_dist_join_load
 test: partitioned_indexes_create
 test: connectivity_checks
+test: schemas_create
 test: views_create
 test: sequences_create
 test: index_create
diff --git a/src/test/regress/expected/schemas.out b/src/test/regress/expected/schemas.out
new file mode 100644
index 000000000..050169b3d
--- /dev/null
+++ b/src/test/regress/expected/schemas.out
@@ -0,0 +1,15 @@
+SELECT nspname FROM pg_namespace WHERE nspname LIKE 'test_schema%' ORDER BY nspname;
+    nspname
+---------------------------------------------------------------------
+ test_schema_1
+ test_schema_3_renamed
+ test_schema_5
+(3 rows)
+
+SELECT * FROM test_schema_5.test_table ORDER BY a;
+ a
+---------------------------------------------------------------------
+ 1
+ 2
+(2 rows)
+
diff --git a/src/test/regress/expected/schemas_create.out b/src/test/regress/expected/schemas_create.out
new file mode 100644
index 000000000..98292e543
--- /dev/null
+++ b/src/test/regress/expected/schemas_create.out
@@ -0,0 +1,15 @@
+CREATE SCHEMA test_schema_1;
+CREATE SCHEMA IF NOT EXISTS test_schema_2;
+CREATE SCHEMA test_schema_3 CREATE TABLE test_table(a INT PRIMARY KEY);
+SELECT create_distributed_table('test_schema_3.test_table','a');
+ create_distributed_table
+---------------------------------------------------------------------
+
+(1 row)
+
+INSERT INTO test_schema_3.test_table VALUES (1), (2);
+DROP SCHEMA test_schema_2;
+CREATE SCHEMA test_schema_4;
+ALTER TABLE test_schema_3.test_table SET SCHEMA test_schema_4;
+ALTER SCHEMA test_schema_3 RENAME TO test_schema_3_renamed;
+ALTER SCHEMA test_schema_4 RENAME TO test_schema_5;
diff --git a/src/test/regress/sql/schemas.sql b/src/test/regress/sql/schemas.sql
new file mode 100644
index 000000000..e7e134d10
--- /dev/null
+++ b/src/test/regress/sql/schemas.sql
@@ -0,0 +1,2 @@
+SELECT nspname FROM pg_namespace WHERE nspname LIKE 'test_schema%' ORDER BY nspname;
+SELECT * FROM test_schema_5.test_table ORDER BY a;
diff --git a/src/test/regress/sql/schemas_create.sql b/src/test/regress/sql/schemas_create.sql
new file mode 100644
index 000000000..a50368c39
--- /dev/null
+++ b/src/test/regress/sql/schemas_create.sql
@@ -0,0 +1,13 @@
+CREATE SCHEMA test_schema_1;
+CREATE SCHEMA IF NOT EXISTS test_schema_2;
+CREATE SCHEMA test_schema_3 CREATE TABLE test_table(a INT PRIMARY KEY);
+
+SELECT create_distributed_table('test_schema_3.test_table','a');
+INSERT INTO test_schema_3.test_table VALUES (1), (2);
+
+DROP SCHEMA test_schema_2;
+CREATE SCHEMA test_schema_4;
+
+ALTER TABLE test_schema_3.test_table SET SCHEMA test_schema_4;
+ALTER SCHEMA test_schema_3 RENAME TO test_schema_3_renamed;
+ALTER SCHEMA test_schema_4 RENAME TO test_schema_5;
diff --git a/src/test/regress/sql_schedule b/src/test/regress/sql_schedule
index b8f74d390..fc011abf6 100644
--- a/src/test/regress/sql_schedule
+++ b/src/test/regress/sql_schedule
@@ -6,6 +6,7 @@ test: intermediate_result_pruning_queries_1 intermediate_result_pruning_queries_
 test: dropped_columns_1 distributed_planning
 test: local_dist_join
 test: connectivity_checks citus_run_command
+test: schemas
 test: sequences
 test: arbitrary_configs_truncate
 test: arbitrary_configs_truncate_cascade