diff --git a/src/backend/columnar/expected/am_create.out b/src/backend/columnar/expected/am_create.out
deleted file mode 100644
index 47c6a6c44..000000000
--- a/src/backend/columnar/expected/am_create.out
+++ /dev/null
@@ -1,20 +0,0 @@
---
--- Test the CREATE statements related to cstore.
---
--- Create uncompressed table
-CREATE TABLE contestant (handle TEXT, birthdate DATE, rating INT,
-	percentile FLOAT, country CHAR(3), achievements TEXT[])
-	USING cstore_tableam;
--- Create compressed table with automatically determined file path
--- COMPRESSED
-CREATE TABLE contestant_compressed (handle TEXT, birthdate DATE, rating INT,
-	percentile FLOAT, country CHAR(3), achievements TEXT[])
-	USING cstore_tableam;
--- Test that querying an empty table works
-ANALYZE contestant;
-SELECT count(*) FROM contestant;
- count 
--------
-     0
-(1 row)
-
diff --git a/src/backend/columnar/data/array_types.csv b/src/test/regress/data/array_types.csv
similarity index 100%
rename from src/backend/columnar/data/array_types.csv
rename to src/test/regress/data/array_types.csv
diff --git a/src/backend/columnar/data/block_filtering.csv b/src/test/regress/data/block_filtering.csv
similarity index 100%
rename from src/backend/columnar/data/block_filtering.csv
rename to src/test/regress/data/block_filtering.csv
diff --git a/src/backend/columnar/data/contestants.1.csv b/src/test/regress/data/contestants.1.csv
similarity index 100%
rename from src/backend/columnar/data/contestants.1.csv
rename to src/test/regress/data/contestants.1.csv
diff --git a/src/backend/columnar/data/contestants.2.csv b/src/test/regress/data/contestants.2.csv
similarity index 100%
rename from src/backend/columnar/data/contestants.2.csv
rename to src/test/regress/data/contestants.2.csv
diff --git a/src/backend/columnar/data/datetime_types.csv b/src/test/regress/data/datetime_types.csv
similarity index 100%
rename from src/backend/columnar/data/datetime_types.csv
rename to src/test/regress/data/datetime_types.csv
diff --git a/src/backend/columnar/data/enum_and_composite_types.csv b/src/test/regress/data/enum_and_composite_types.csv
similarity index 100%
rename from src/backend/columnar/data/enum_and_composite_types.csv
rename to src/test/regress/data/enum_and_composite_types.csv
diff --git a/src/backend/columnar/data/null_values.csv b/src/test/regress/data/null_values.csv
similarity index 100%
rename from src/backend/columnar/data/null_values.csv
rename to src/test/regress/data/null_values.csv
diff --git a/src/backend/columnar/data/other_types.csv b/src/test/regress/data/other_types.csv
similarity index 100%
rename from src/backend/columnar/data/other_types.csv
rename to src/test/regress/data/other_types.csv
diff --git a/src/backend/columnar/data/range_types.csv b/src/test/regress/data/range_types.csv
similarity index 100%
rename from src/backend/columnar/data/range_types.csv
rename to src/test/regress/data/range_types.csv
diff --git a/src/backend/columnar/expected/am_alter.out b/src/test/regress/expected/am_alter.out
similarity index 100%
rename from src/backend/columnar/expected/am_alter.out
rename to src/test/regress/expected/am_alter.out
diff --git a/src/backend/columnar/expected/am_analyze.out b/src/test/regress/expected/am_analyze.out
similarity index 100%
rename from src/backend/columnar/expected/am_analyze.out
rename to src/test/regress/expected/am_analyze.out
diff --git a/src/backend/columnar/expected/am_clean.out b/src/test/regress/expected/am_clean.out
similarity index 100%
rename from src/backend/columnar/expected/am_clean.out
rename to src/test/regress/expected/am_clean.out
diff --git a/src/backend/columnar/expected/am_drop.out b/src/test/regress/expected/am_drop.out
similarity index 100%
rename from src/backend/columnar/expected/am_drop.out
rename to src/test/regress/expected/am_drop.out
diff --git a/src/backend/columnar/expected/am_functions.out b/src/test/regress/expected/am_functions.out
similarity index 100%
rename from src/backend/columnar/expected/am_functions.out
rename to src/test/regress/expected/am_functions.out
diff --git a/src/backend/columnar/expected/am_insert.out b/src/test/regress/expected/am_insert.out
similarity index 100%
rename from src/backend/columnar/expected/am_insert.out
rename to src/test/regress/expected/am_insert.out
diff --git a/src/backend/columnar/expected/am_join.out b/src/test/regress/expected/am_join.out
similarity index 100%
rename from src/backend/columnar/expected/am_join.out
rename to src/test/regress/expected/am_join.out
diff --git a/src/backend/columnar/expected/am_query.out b/src/test/regress/expected/am_query.out
similarity index 100%
rename from src/backend/columnar/expected/am_query.out
rename to src/test/regress/expected/am_query.out
diff --git a/src/backend/columnar/expected/am_rollback.out b/src/test/regress/expected/am_rollback.out
similarity index 100%
rename from src/backend/columnar/expected/am_rollback.out
rename to src/test/regress/expected/am_rollback.out
diff --git a/src/backend/columnar/expected/am_tableoptions.out b/src/test/regress/expected/am_tableoptions.out
similarity index 100%
rename from src/backend/columnar/expected/am_tableoptions.out
rename to src/test/regress/expected/am_tableoptions.out
diff --git a/src/backend/columnar/expected/am_trigger.out b/src/test/regress/expected/am_trigger.out
similarity index 100%
rename from src/backend/columnar/expected/am_trigger.out
rename to src/test/regress/expected/am_trigger.out
diff --git a/src/backend/columnar/expected/am_truncate.out b/src/test/regress/expected/am_truncate.out
similarity index 100%
rename from src/backend/columnar/expected/am_truncate.out
rename to src/test/regress/expected/am_truncate.out
diff --git a/src/backend/columnar/expected/am_truncate_0.out b/src/test/regress/expected/am_truncate_0.out
similarity index 100%
rename from src/backend/columnar/expected/am_truncate_0.out
rename to src/test/regress/expected/am_truncate_0.out
diff --git a/src/backend/columnar/expected/am_vacuum.out b/src/test/regress/expected/am_vacuum.out
similarity index 100%
rename from src/backend/columnar/expected/am_vacuum.out
rename to src/test/regress/expected/am_vacuum.out
diff --git a/src/backend/columnar/expected/am_vacuum_vs_insert.out b/src/test/regress/expected/am_vacuum_vs_insert.out
similarity index 100%
rename from src/backend/columnar/expected/am_vacuum_vs_insert.out
rename to src/test/regress/expected/am_vacuum_vs_insert.out
diff --git a/src/backend/columnar/expected/am_write_concurrency.out b/src/test/regress/expected/am_write_concurrency.out
similarity index 100%
rename from src/backend/columnar/expected/am_write_concurrency.out
rename to src/test/regress/expected/am_write_concurrency.out
diff --git a/src/backend/columnar/expected/create.out b/src/test/regress/expected/create.out
similarity index 100%
rename from src/backend/columnar/expected/create.out
rename to src/test/regress/expected/create.out
diff --git a/src/backend/columnar/expected/extension_create.out b/src/test/regress/expected/extension_create.out
similarity index 100%
rename from src/backend/columnar/expected/extension_create.out
rename to src/test/regress/expected/extension_create.out
diff --git a/src/backend/columnar/expected/fdw_alter.out b/src/test/regress/expected/fdw_alter.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_alter.out
rename to src/test/regress/expected/fdw_alter.out
diff --git a/src/backend/columnar/expected/fdw_analyze.out b/src/test/regress/expected/fdw_analyze.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_analyze.out
rename to src/test/regress/expected/fdw_analyze.out
diff --git a/src/backend/columnar/expected/fdw_clean.out b/src/test/regress/expected/fdw_clean.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_clean.out
rename to src/test/regress/expected/fdw_clean.out
diff --git a/src/backend/columnar/expected/fdw_drop.out b/src/test/regress/expected/fdw_drop.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_drop.out
rename to src/test/regress/expected/fdw_drop.out
diff --git a/src/backend/columnar/expected/fdw_functions.out b/src/test/regress/expected/fdw_functions.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_functions.out
rename to src/test/regress/expected/fdw_functions.out
diff --git a/src/backend/columnar/expected/fdw_insert.out b/src/test/regress/expected/fdw_insert.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_insert.out
rename to src/test/regress/expected/fdw_insert.out
diff --git a/src/backend/columnar/expected/fdw_query.out b/src/test/regress/expected/fdw_query.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_query.out
rename to src/test/regress/expected/fdw_query.out
diff --git a/src/backend/columnar/expected/fdw_rollback.out b/src/test/regress/expected/fdw_rollback.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_rollback.out
rename to src/test/regress/expected/fdw_rollback.out
diff --git a/src/backend/columnar/expected/fdw_truncate.out b/src/test/regress/expected/fdw_truncate.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_truncate.out
rename to src/test/regress/expected/fdw_truncate.out
diff --git a/src/backend/columnar/expected/fdw_truncate_0.out b/src/test/regress/expected/fdw_truncate_0.out
similarity index 100%
rename from src/backend/columnar/expected/fdw_truncate_0.out
rename to src/test/regress/expected/fdw_truncate_0.out
diff --git a/src/backend/columnar/input/am_block_filtering.source b/src/test/regress/input/am_block_filtering.source
similarity index 100%
rename from src/backend/columnar/input/am_block_filtering.source
rename to src/test/regress/input/am_block_filtering.source
diff --git a/src/backend/columnar/input/am_copyto.source b/src/test/regress/input/am_copyto.source
similarity index 100%
rename from src/backend/columnar/input/am_copyto.source
rename to src/test/regress/input/am_copyto.source
diff --git a/src/backend/columnar/input/am_create.source b/src/test/regress/input/am_create.source
similarity index 100%
rename from src/backend/columnar/input/am_create.source
rename to src/test/regress/input/am_create.source
diff --git a/src/backend/columnar/input/am_data_types.source b/src/test/regress/input/am_data_types.source
similarity index 100%
rename from src/backend/columnar/input/am_data_types.source
rename to src/test/regress/input/am_data_types.source
diff --git a/src/backend/columnar/input/am_load.source b/src/test/regress/input/am_load.source
similarity index 100%
rename from src/backend/columnar/input/am_load.source
rename to src/test/regress/input/am_load.source
diff --git a/src/backend/columnar/input/fdw_block_filtering.source b/src/test/regress/input/fdw_block_filtering.source
similarity index 100%
rename from src/backend/columnar/input/fdw_block_filtering.source
rename to src/test/regress/input/fdw_block_filtering.source
diff --git a/src/backend/columnar/input/fdw_copyto.source b/src/test/regress/input/fdw_copyto.source
similarity index 100%
rename from src/backend/columnar/input/fdw_copyto.source
rename to src/test/regress/input/fdw_copyto.source
diff --git a/src/backend/columnar/input/fdw_create.source b/src/test/regress/input/fdw_create.source
similarity index 100%
rename from src/backend/columnar/input/fdw_create.source
rename to src/test/regress/input/fdw_create.source
diff --git a/src/backend/columnar/input/fdw_data_types.source b/src/test/regress/input/fdw_data_types.source
similarity index 100%
rename from src/backend/columnar/input/fdw_data_types.source
rename to src/test/regress/input/fdw_data_types.source
diff --git a/src/backend/columnar/input/fdw_load.source b/src/test/regress/input/fdw_load.source
similarity index 100%
rename from src/backend/columnar/input/fdw_load.source
rename to src/test/regress/input/fdw_load.source
diff --git a/src/backend/columnar/output/am_block_filtering.source b/src/test/regress/output/am_block_filtering.source
similarity index 100%
rename from src/backend/columnar/output/am_block_filtering.source
rename to src/test/regress/output/am_block_filtering.source
diff --git a/src/backend/columnar/output/am_copyto.source b/src/test/regress/output/am_copyto.source
similarity index 100%
rename from src/backend/columnar/output/am_copyto.source
rename to src/test/regress/output/am_copyto.source
diff --git a/src/backend/columnar/output/am_create.source b/src/test/regress/output/am_create.source
similarity index 100%
rename from src/backend/columnar/output/am_create.source
rename to src/test/regress/output/am_create.source
diff --git a/src/backend/columnar/output/am_data_types.source b/src/test/regress/output/am_data_types.source
similarity index 100%
rename from src/backend/columnar/output/am_data_types.source
rename to src/test/regress/output/am_data_types.source
diff --git a/src/backend/columnar/output/am_load.source b/src/test/regress/output/am_load.source
similarity index 100%
rename from src/backend/columnar/output/am_load.source
rename to src/test/regress/output/am_load.source
diff --git a/src/backend/columnar/output/fdw_block_filtering.source b/src/test/regress/output/fdw_block_filtering.source
similarity index 100%
rename from src/backend/columnar/output/fdw_block_filtering.source
rename to src/test/regress/output/fdw_block_filtering.source
diff --git a/src/backend/columnar/output/fdw_copyto.source b/src/test/regress/output/fdw_copyto.source
similarity index 100%
rename from src/backend/columnar/output/fdw_copyto.source
rename to src/test/regress/output/fdw_copyto.source
diff --git a/src/backend/columnar/output/fdw_create.source b/src/test/regress/output/fdw_create.source
similarity index 100%
rename from src/backend/columnar/output/fdw_create.source
rename to src/test/regress/output/fdw_create.source
diff --git a/src/backend/columnar/output/fdw_data_types.source b/src/test/regress/output/fdw_data_types.source
similarity index 100%
rename from src/backend/columnar/output/fdw_data_types.source
rename to src/test/regress/output/fdw_data_types.source
diff --git a/src/backend/columnar/output/fdw_load.source b/src/test/regress/output/fdw_load.source
similarity index 100%
rename from src/backend/columnar/output/fdw_load.source
rename to src/test/regress/output/fdw_load.source
diff --git a/src/backend/columnar/specs/am_vacuum_vs_insert.spec b/src/test/regress/spec/am_vacuum_vs_insert.spec
similarity index 100%
rename from src/backend/columnar/specs/am_vacuum_vs_insert.spec
rename to src/test/regress/spec/am_vacuum_vs_insert.spec
diff --git a/src/backend/columnar/specs/am_write_concurrency.spec b/src/test/regress/spec/am_write_concurrency.spec
similarity index 100%
rename from src/backend/columnar/specs/am_write_concurrency.spec
rename to src/test/regress/spec/am_write_concurrency.spec
diff --git a/src/backend/columnar/specs/create.spec b/src/test/regress/spec/create.spec
similarity index 100%
rename from src/backend/columnar/specs/create.spec
rename to src/test/regress/spec/create.spec
diff --git a/src/backend/columnar/sql/am_alter.sql b/src/test/regress/sql/am_alter.sql
similarity index 100%
rename from src/backend/columnar/sql/am_alter.sql
rename to src/test/regress/sql/am_alter.sql
diff --git a/src/backend/columnar/sql/am_analyze.sql b/src/test/regress/sql/am_analyze.sql
similarity index 100%
rename from src/backend/columnar/sql/am_analyze.sql
rename to src/test/regress/sql/am_analyze.sql
diff --git a/src/backend/columnar/sql/am_clean.sql b/src/test/regress/sql/am_clean.sql
similarity index 100%
rename from src/backend/columnar/sql/am_clean.sql
rename to src/test/regress/sql/am_clean.sql
diff --git a/src/backend/columnar/sql/am_drop.sql b/src/test/regress/sql/am_drop.sql
similarity index 100%
rename from src/backend/columnar/sql/am_drop.sql
rename to src/test/regress/sql/am_drop.sql
diff --git a/src/backend/columnar/sql/am_functions.sql b/src/test/regress/sql/am_functions.sql
similarity index 100%
rename from src/backend/columnar/sql/am_functions.sql
rename to src/test/regress/sql/am_functions.sql
diff --git a/src/backend/columnar/sql/am_insert.sql b/src/test/regress/sql/am_insert.sql
similarity index 100%
rename from src/backend/columnar/sql/am_insert.sql
rename to src/test/regress/sql/am_insert.sql
diff --git a/src/backend/columnar/sql/am_join.sql b/src/test/regress/sql/am_join.sql
similarity index 100%
rename from src/backend/columnar/sql/am_join.sql
rename to src/test/regress/sql/am_join.sql
diff --git a/src/backend/columnar/sql/am_query.sql b/src/test/regress/sql/am_query.sql
similarity index 100%
rename from src/backend/columnar/sql/am_query.sql
rename to src/test/regress/sql/am_query.sql
diff --git a/src/backend/columnar/sql/am_rollback.sql b/src/test/regress/sql/am_rollback.sql
similarity index 100%
rename from src/backend/columnar/sql/am_rollback.sql
rename to src/test/regress/sql/am_rollback.sql
diff --git a/src/backend/columnar/sql/am_tableoptions.sql b/src/test/regress/sql/am_tableoptions.sql
similarity index 100%
rename from src/backend/columnar/sql/am_tableoptions.sql
rename to src/test/regress/sql/am_tableoptions.sql
diff --git a/src/backend/columnar/sql/am_trigger.sql b/src/test/regress/sql/am_trigger.sql
similarity index 100%
rename from src/backend/columnar/sql/am_trigger.sql
rename to src/test/regress/sql/am_trigger.sql
diff --git a/src/backend/columnar/sql/am_truncate.sql b/src/test/regress/sql/am_truncate.sql
similarity index 100%
rename from src/backend/columnar/sql/am_truncate.sql
rename to src/test/regress/sql/am_truncate.sql
diff --git a/src/backend/columnar/sql/am_vacuum.sql b/src/test/regress/sql/am_vacuum.sql
similarity index 100%
rename from src/backend/columnar/sql/am_vacuum.sql
rename to src/test/regress/sql/am_vacuum.sql
diff --git a/src/backend/columnar/sql/extension_create.sql b/src/test/regress/sql/extension_create.sql
similarity index 100%
rename from src/backend/columnar/sql/extension_create.sql
rename to src/test/regress/sql/extension_create.sql
diff --git a/src/backend/columnar/sql/fdw_alter.sql b/src/test/regress/sql/fdw_alter.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_alter.sql
rename to src/test/regress/sql/fdw_alter.sql
diff --git a/src/backend/columnar/sql/fdw_analyze.sql b/src/test/regress/sql/fdw_analyze.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_analyze.sql
rename to src/test/regress/sql/fdw_analyze.sql
diff --git a/src/backend/columnar/sql/fdw_clean.sql b/src/test/regress/sql/fdw_clean.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_clean.sql
rename to src/test/regress/sql/fdw_clean.sql
diff --git a/src/backend/columnar/sql/fdw_drop.sql b/src/test/regress/sql/fdw_drop.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_drop.sql
rename to src/test/regress/sql/fdw_drop.sql
diff --git a/src/backend/columnar/sql/fdw_functions.sql b/src/test/regress/sql/fdw_functions.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_functions.sql
rename to src/test/regress/sql/fdw_functions.sql
diff --git a/src/backend/columnar/sql/fdw_insert.sql b/src/test/regress/sql/fdw_insert.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_insert.sql
rename to src/test/regress/sql/fdw_insert.sql
diff --git a/src/backend/columnar/sql/fdw_query.sql b/src/test/regress/sql/fdw_query.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_query.sql
rename to src/test/regress/sql/fdw_query.sql
diff --git a/src/backend/columnar/sql/fdw_rollback.sql b/src/test/regress/sql/fdw_rollback.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_rollback.sql
rename to src/test/regress/sql/fdw_rollback.sql
diff --git a/src/backend/columnar/sql/fdw_truncate.sql b/src/test/regress/sql/fdw_truncate.sql
similarity index 100%
rename from src/backend/columnar/sql/fdw_truncate.sql
rename to src/test/regress/sql/fdw_truncate.sql