diff --git a/src/test/regress/.gitignore b/src/test/regress/.gitignore
index bdc8b8df9..1760622d8 100644
--- a/src/test/regress/.gitignore
+++ b/src/test/regress/.gitignore
@@ -38,7 +38,6 @@ create_function_2.sql
 largeobject.sql
 misc.sql
 security_label.sql
-tablespace.sql
 constraints.out
 copy.out
 create_function_0.out
@@ -48,4 +47,3 @@ largeobject.out
 largeobject_1.out
 misc.out
 security_label.out
-tablespace.out
diff --git a/src/test/regress/expected/.gitignore b/src/test/regress/expected/.gitignore
deleted file mode 100644
index acb41a987..000000000
--- a/src/test/regress/expected/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-/columnar_copyto.out
-/columnar_data_types.out
-/columnar_load.out
-/hyperscale_tutorial.out
-/multi_agg_distinct.out
-/multi_agg_type_conversion.out
-/multi_alter_table_statements.out
-/multi_behavioral_analytics_create_table.out
-/multi_behavioral_analytics_create_table_superuser.out
-/multi_complex_count_distinct.out
-/multi_copy.out
-/multi_load_data.out
-/multi_load_data_superuser.out
-/multi_load_more_data.out
-/multi_multiuser_load_data.out
-/multi_mx_copy_data.out
-/multi_outer_join.out
-/multi_outer_join_reference.out
-/tablespace.out
diff --git a/src/test/regress/output/columnar_copyto.source b/src/test/regress/expected/columnar_copyto.out
similarity index 100%
rename from src/test/regress/output/columnar_copyto.source
rename to src/test/regress/expected/columnar_copyto.out
diff --git a/src/test/regress/output/columnar_data_types.source b/src/test/regress/expected/columnar_data_types.out
similarity index 100%
rename from src/test/regress/output/columnar_data_types.source
rename to src/test/regress/expected/columnar_data_types.out
diff --git a/src/test/regress/output/columnar_load.source b/src/test/regress/expected/columnar_load.out
similarity index 100%
rename from src/test/regress/output/columnar_load.source
rename to src/test/regress/expected/columnar_load.out
diff --git a/src/test/regress/output/hyperscale_tutorial.source b/src/test/regress/expected/hyperscale_tutorial.out
similarity index 100%
rename from src/test/regress/output/hyperscale_tutorial.source
rename to src/test/regress/expected/hyperscale_tutorial.out
diff --git a/src/test/regress/output/multi_agg_distinct.source b/src/test/regress/expected/multi_agg_distinct.out
similarity index 100%
rename from src/test/regress/output/multi_agg_distinct.source
rename to src/test/regress/expected/multi_agg_distinct.out
diff --git a/src/test/regress/output/multi_agg_type_conversion.source b/src/test/regress/expected/multi_agg_type_conversion.out
similarity index 100%
rename from src/test/regress/output/multi_agg_type_conversion.source
rename to src/test/regress/expected/multi_agg_type_conversion.out
diff --git a/src/test/regress/output/multi_alter_table_statements.source b/src/test/regress/expected/multi_alter_table_statements.out
similarity index 100%
rename from src/test/regress/output/multi_alter_table_statements.source
rename to src/test/regress/expected/multi_alter_table_statements.out
diff --git a/src/test/regress/output/multi_behavioral_analytics_create_table.source b/src/test/regress/expected/multi_behavioral_analytics_create_table.out
similarity index 100%
rename from src/test/regress/output/multi_behavioral_analytics_create_table.source
rename to src/test/regress/expected/multi_behavioral_analytics_create_table.out
diff --git a/src/test/regress/output/multi_behavioral_analytics_create_table_superuser.source b/src/test/regress/expected/multi_behavioral_analytics_create_table_superuser.out
similarity index 100%
rename from src/test/regress/output/multi_behavioral_analytics_create_table_superuser.source
rename to src/test/regress/expected/multi_behavioral_analytics_create_table_superuser.out
diff --git a/src/test/regress/output/multi_complex_count_distinct.source b/src/test/regress/expected/multi_complex_count_distinct.out
similarity index 100%
rename from src/test/regress/output/multi_complex_count_distinct.source
rename to src/test/regress/expected/multi_complex_count_distinct.out
diff --git a/src/test/regress/output/multi_copy.source b/src/test/regress/expected/multi_copy.out
similarity index 100%
rename from src/test/regress/output/multi_copy.source
rename to src/test/regress/expected/multi_copy.out
diff --git a/src/test/regress/output/multi_load_data.source b/src/test/regress/expected/multi_load_data.out
similarity index 100%
rename from src/test/regress/output/multi_load_data.source
rename to src/test/regress/expected/multi_load_data.out
diff --git a/src/test/regress/input/multi_load_data_superuser.source b/src/test/regress/expected/multi_load_data_superuser.out
similarity index 100%
rename from src/test/regress/input/multi_load_data_superuser.source
rename to src/test/regress/expected/multi_load_data_superuser.out
diff --git a/src/test/regress/output/multi_load_more_data.source b/src/test/regress/expected/multi_load_more_data.out
similarity index 100%
rename from src/test/regress/output/multi_load_more_data.source
rename to src/test/regress/expected/multi_load_more_data.out
diff --git a/src/test/regress/output/multi_multiuser_load_data.source b/src/test/regress/expected/multi_multiuser_load_data.out
similarity index 100%
rename from src/test/regress/output/multi_multiuser_load_data.source
rename to src/test/regress/expected/multi_multiuser_load_data.out
diff --git a/src/test/regress/output/multi_mx_copy_data.source b/src/test/regress/expected/multi_mx_copy_data.out
similarity index 100%
rename from src/test/regress/output/multi_mx_copy_data.source
rename to src/test/regress/expected/multi_mx_copy_data.out
diff --git a/src/test/regress/output/multi_outer_join.source b/src/test/regress/expected/multi_outer_join.out
similarity index 100%
rename from src/test/regress/output/multi_outer_join.source
rename to src/test/regress/expected/multi_outer_join.out
diff --git a/src/test/regress/output/multi_outer_join_reference.source b/src/test/regress/expected/multi_outer_join_reference.out
similarity index 100%
rename from src/test/regress/output/multi_outer_join_reference.source
rename to src/test/regress/expected/multi_outer_join_reference.out
diff --git a/src/test/regress/output/tablespace.source b/src/test/regress/expected/tablespace.out
similarity index 100%
rename from src/test/regress/output/tablespace.source
rename to src/test/regress/expected/tablespace.out
diff --git a/src/test/regress/sql/.gitignore b/src/test/regress/sql/.gitignore
deleted file mode 100644
index 20f1e030c..000000000
--- a/src/test/regress/sql/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-/columnar_copyto.sql
-/columnar_data_types.sql
-/columnar_load.sql
-/hyperscale_tutorial.sql
-/multi_agg_distinct.sql
-/multi_agg_type_conversion.sql
-/multi_alter_table_statements.sql
-/multi_behavioral_analytics_create_table.sql
-/multi_behavioral_analytics_create_table_superuser.sql
-/multi_complex_count_distinct.sql
-/multi_copy.sql
-/multi_load_data.sql
-/multi_load_data_superuser.sql
-/multi_load_more_data.sql
-/multi_multiuser_load_data.sql
-/multi_mx_copy_data.sql
-/multi_outer_join.sql
-/multi_outer_join_reference.sql
-/tablespace.sql
diff --git a/src/test/regress/input/columnar_copyto.source b/src/test/regress/sql/columnar_copyto.sql
similarity index 100%
rename from src/test/regress/input/columnar_copyto.source
rename to src/test/regress/sql/columnar_copyto.sql
diff --git a/src/test/regress/input/columnar_data_types.source b/src/test/regress/sql/columnar_data_types.sql
similarity index 100%
rename from src/test/regress/input/columnar_data_types.source
rename to src/test/regress/sql/columnar_data_types.sql
diff --git a/src/test/regress/input/columnar_load.source b/src/test/regress/sql/columnar_load.sql
similarity index 100%
rename from src/test/regress/input/columnar_load.source
rename to src/test/regress/sql/columnar_load.sql
diff --git a/src/test/regress/input/hyperscale_tutorial.source b/src/test/regress/sql/hyperscale_tutorial.sql
similarity index 100%
rename from src/test/regress/input/hyperscale_tutorial.source
rename to src/test/regress/sql/hyperscale_tutorial.sql
diff --git a/src/test/regress/input/multi_agg_distinct.source b/src/test/regress/sql/multi_agg_distinct.sql
similarity index 100%
rename from src/test/regress/input/multi_agg_distinct.source
rename to src/test/regress/sql/multi_agg_distinct.sql
diff --git a/src/test/regress/input/multi_agg_type_conversion.source b/src/test/regress/sql/multi_agg_type_conversion.sql
similarity index 100%
rename from src/test/regress/input/multi_agg_type_conversion.source
rename to src/test/regress/sql/multi_agg_type_conversion.sql
diff --git a/src/test/regress/input/multi_alter_table_statements.source b/src/test/regress/sql/multi_alter_table_statements.sql
similarity index 100%
rename from src/test/regress/input/multi_alter_table_statements.source
rename to src/test/regress/sql/multi_alter_table_statements.sql
diff --git a/src/test/regress/input/multi_behavioral_analytics_create_table.source b/src/test/regress/sql/multi_behavioral_analytics_create_table.sql
similarity index 100%
rename from src/test/regress/input/multi_behavioral_analytics_create_table.source
rename to src/test/regress/sql/multi_behavioral_analytics_create_table.sql
diff --git a/src/test/regress/input/multi_behavioral_analytics_create_table_superuser.source b/src/test/regress/sql/multi_behavioral_analytics_create_table_superuser.sql
similarity index 100%
rename from src/test/regress/input/multi_behavioral_analytics_create_table_superuser.source
rename to src/test/regress/sql/multi_behavioral_analytics_create_table_superuser.sql
diff --git a/src/test/regress/input/multi_complex_count_distinct.source b/src/test/regress/sql/multi_complex_count_distinct.sql
similarity index 100%
rename from src/test/regress/input/multi_complex_count_distinct.source
rename to src/test/regress/sql/multi_complex_count_distinct.sql
diff --git a/src/test/regress/input/multi_copy.source b/src/test/regress/sql/multi_copy.sql
similarity index 100%
rename from src/test/regress/input/multi_copy.source
rename to src/test/regress/sql/multi_copy.sql
diff --git a/src/test/regress/input/multi_load_data.source b/src/test/regress/sql/multi_load_data.sql
similarity index 100%
rename from src/test/regress/input/multi_load_data.source
rename to src/test/regress/sql/multi_load_data.sql
diff --git a/src/test/regress/output/multi_load_data_superuser.source b/src/test/regress/sql/multi_load_data_superuser.sql
similarity index 100%
rename from src/test/regress/output/multi_load_data_superuser.source
rename to src/test/regress/sql/multi_load_data_superuser.sql
diff --git a/src/test/regress/input/multi_load_more_data.source b/src/test/regress/sql/multi_load_more_data.sql
similarity index 100%
rename from src/test/regress/input/multi_load_more_data.source
rename to src/test/regress/sql/multi_load_more_data.sql
diff --git a/src/test/regress/input/multi_multiuser_load_data.source b/src/test/regress/sql/multi_multiuser_load_data.sql
similarity index 100%
rename from src/test/regress/input/multi_multiuser_load_data.source
rename to src/test/regress/sql/multi_multiuser_load_data.sql
diff --git a/src/test/regress/input/multi_mx_copy_data.source b/src/test/regress/sql/multi_mx_copy_data.sql
similarity index 100%
rename from src/test/regress/input/multi_mx_copy_data.source
rename to src/test/regress/sql/multi_mx_copy_data.sql
diff --git a/src/test/regress/input/multi_outer_join.source b/src/test/regress/sql/multi_outer_join.sql
similarity index 100%
rename from src/test/regress/input/multi_outer_join.source
rename to src/test/regress/sql/multi_outer_join.sql
diff --git a/src/test/regress/input/multi_outer_join_reference.source b/src/test/regress/sql/multi_outer_join_reference.sql
similarity index 100%
rename from src/test/regress/input/multi_outer_join_reference.source
rename to src/test/regress/sql/multi_outer_join_reference.sql
diff --git a/src/test/regress/input/tablespace.source b/src/test/regress/sql/tablespace.sql
similarity index 100%
rename from src/test/regress/input/tablespace.source
rename to src/test/regress/sql/tablespace.sql