diff --git a/Makefile b/Makefile
index b8277f3a2..a266edd9a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ DATA = cstore_fdw--1.7.sql cstore_fdw--1.6--1.7.sql  cstore_fdw--1.5--1.6.sql cs
 	   cstore_fdw--1.3--1.4.sql cstore_fdw--1.2--1.3.sql cstore_fdw--1.1--1.2.sql \
 	   cstore_fdw--1.0--1.1.sql
 
-REGRESS = create load query analyze data_types functions block_filtering drop \
-		  insert copyto alter truncate
+REGRESS = fdw_create fdw_load fdw_query fdw_analyze fdw_data_types fdw_functions \
+	  fdw_block_filtering fdw_drop fdw_insert fdw_copyto fdw_alter fdw_truncate
 EXTRA_CLEAN = cstore.pb-c.h cstore.pb-c.c data/*.cstore data/*.cstore.footer \
               sql/block_filtering.sql sql/create.sql sql/data_types.sql sql/load.sql \
               sql/copyto.sql expected/block_filtering.out expected/create.out \
diff --git a/expected/alter.out b/expected/fdw_alter.out
similarity index 100%
rename from expected/alter.out
rename to expected/fdw_alter.out
diff --git a/expected/analyze.out b/expected/fdw_analyze.out
similarity index 100%
rename from expected/analyze.out
rename to expected/fdw_analyze.out
diff --git a/expected/drop.out b/expected/fdw_drop.out
similarity index 100%
rename from expected/drop.out
rename to expected/fdw_drop.out
diff --git a/expected/functions.out b/expected/fdw_functions.out
similarity index 100%
rename from expected/functions.out
rename to expected/fdw_functions.out
diff --git a/expected/insert.out b/expected/fdw_insert.out
similarity index 100%
rename from expected/insert.out
rename to expected/fdw_insert.out
diff --git a/expected/query.out b/expected/fdw_query.out
similarity index 100%
rename from expected/query.out
rename to expected/fdw_query.out
diff --git a/expected/truncate.out b/expected/fdw_truncate.out
similarity index 100%
rename from expected/truncate.out
rename to expected/fdw_truncate.out
diff --git a/expected/truncate_0.out b/expected/fdw_truncate_0.out
similarity index 100%
rename from expected/truncate_0.out
rename to expected/fdw_truncate_0.out
diff --git a/input/block_filtering.source b/input/fdw_block_filtering.source
similarity index 100%
rename from input/block_filtering.source
rename to input/fdw_block_filtering.source
diff --git a/input/copyto.source b/input/fdw_copyto.source
similarity index 100%
rename from input/copyto.source
rename to input/fdw_copyto.source
diff --git a/input/create.source b/input/fdw_create.source
similarity index 100%
rename from input/create.source
rename to input/fdw_create.source
diff --git a/input/data_types.source b/input/fdw_data_types.source
similarity index 100%
rename from input/data_types.source
rename to input/fdw_data_types.source
diff --git a/input/load.source b/input/fdw_load.source
similarity index 100%
rename from input/load.source
rename to input/fdw_load.source
diff --git a/output/block_filtering.source b/output/fdw_block_filtering.source
similarity index 100%
rename from output/block_filtering.source
rename to output/fdw_block_filtering.source
diff --git a/output/copyto.source b/output/fdw_copyto.source
similarity index 100%
rename from output/copyto.source
rename to output/fdw_copyto.source
diff --git a/output/create.source b/output/fdw_create.source
similarity index 100%
rename from output/create.source
rename to output/fdw_create.source
diff --git a/output/data_types.source b/output/fdw_data_types.source
similarity index 100%
rename from output/data_types.source
rename to output/fdw_data_types.source
diff --git a/output/load.source b/output/fdw_load.source
similarity index 100%
rename from output/load.source
rename to output/fdw_load.source
diff --git a/sql/alter.sql b/sql/fdw_alter.sql
similarity index 100%
rename from sql/alter.sql
rename to sql/fdw_alter.sql
diff --git a/sql/analyze.sql b/sql/fdw_analyze.sql
similarity index 100%
rename from sql/analyze.sql
rename to sql/fdw_analyze.sql
diff --git a/sql/drop.sql b/sql/fdw_drop.sql
similarity index 100%
rename from sql/drop.sql
rename to sql/fdw_drop.sql
diff --git a/sql/functions.sql b/sql/fdw_functions.sql
similarity index 100%
rename from sql/functions.sql
rename to sql/fdw_functions.sql
diff --git a/sql/insert.sql b/sql/fdw_insert.sql
similarity index 100%
rename from sql/insert.sql
rename to sql/fdw_insert.sql
diff --git a/sql/query.sql b/sql/fdw_query.sql
similarity index 100%
rename from sql/query.sql
rename to sql/fdw_query.sql
diff --git a/sql/truncate.sql b/sql/fdw_truncate.sql
similarity index 100%
rename from sql/truncate.sql
rename to sql/fdw_truncate.sql