diff --git a/contrib/dblink/output/paths.source b/contrib/dblink/expected/paths.out
similarity index 100%
rename from contrib/dblink/output/paths.source
rename to contrib/dblink/expected/paths.out
diff --git a/contrib/dblink/input/paths.source b/contrib/dblink/sql/paths.sql
similarity index 100%
rename from contrib/dblink/input/paths.source
rename to contrib/dblink/sql/paths.sql
diff --git a/contrib/file_fdw/output/file_fdw.source b/contrib/file_fdw/expected/file_fdw.out
similarity index 100%
rename from contrib/file_fdw/output/file_fdw.source
rename to contrib/file_fdw/expected/file_fdw.out
diff --git a/contrib/file_fdw/input/file_fdw.source b/contrib/file_fdw/sql/file_fdw.sql
similarity index 100%
rename from contrib/file_fdw/input/file_fdw.source
rename to contrib/file_fdw/sql/file_fdw.sql
diff --git a/src/pl/plpgsql/src/output/plpgsql_copy.source b/src/pl/plpgsql/src/expected/plpgsql_copy.out
similarity index 100%
rename from src/pl/plpgsql/src/output/plpgsql_copy.source
rename to src/pl/plpgsql/src/expected/plpgsql_copy.out
diff --git a/src/pl/plpgsql/src/input/plpgsql_copy.source b/src/pl/plpgsql/src/sql/plpgsql_copy.sql
similarity index 100%
rename from src/pl/plpgsql/src/input/plpgsql_copy.source
rename to src/pl/plpgsql/src/sql/plpgsql_copy.sql
diff --git a/src/test/regress/output/constraints.source b/src/test/regress/expected/constraints.out
similarity index 100%
rename from src/test/regress/output/constraints.source
rename to src/test/regress/expected/constraints.out
diff --git a/src/test/regress/output/copy.source b/src/test/regress/expected/copy.out
similarity index 100%
rename from src/test/regress/output/copy.source
rename to src/test/regress/expected/copy.out
diff --git a/src/test/regress/output/create_function_0.source b/src/test/regress/expected/create_function_0.out
similarity index 100%
rename from src/test/regress/output/create_function_0.source
rename to src/test/regress/expected/create_function_0.out
diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/expected/create_function_1.out
similarity index 100%
rename from src/test/regress/output/create_function_1.source
rename to src/test/regress/expected/create_function_1.out
diff --git a/src/test/regress/output/create_function_2.source b/src/test/regress/expected/create_function_2.out
similarity index 100%
rename from src/test/regress/output/create_function_2.source
rename to src/test/regress/expected/create_function_2.out
diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/expected/largeobject.out
similarity index 100%
rename from src/test/regress/output/largeobject.source
rename to src/test/regress/expected/largeobject.out
diff --git a/src/test/regress/output/largeobject_1.source b/src/test/regress/expected/largeobject_1.out
similarity index 100%
rename from src/test/regress/output/largeobject_1.source
rename to src/test/regress/expected/largeobject_1.out
diff --git a/src/test/regress/output/misc.source b/src/test/regress/expected/misc.out
similarity index 100%
rename from src/test/regress/output/misc.source
rename to src/test/regress/expected/misc.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/input/constraints.source b/src/test/regress/sql/constraints.sql
similarity index 100%
rename from src/test/regress/input/constraints.source
rename to src/test/regress/sql/constraints.sql
diff --git a/src/test/regress/input/copy.source b/src/test/regress/sql/copy.sql
similarity index 100%
rename from src/test/regress/input/copy.source
rename to src/test/regress/sql/copy.sql
diff --git a/src/test/regress/input/create_function_0.source b/src/test/regress/sql/create_function_0.sql
similarity index 100%
rename from src/test/regress/input/create_function_0.source
rename to src/test/regress/sql/create_function_0.sql
diff --git a/src/test/regress/input/create_function_1.source b/src/test/regress/sql/create_function_1.sql
similarity index 100%
rename from src/test/regress/input/create_function_1.source
rename to src/test/regress/sql/create_function_1.sql
diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/sql/create_function_2.sql
similarity index 100%
rename from src/test/regress/input/create_function_2.source
rename to src/test/regress/sql/create_function_2.sql
diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/sql/largeobject.sql
similarity index 100%
rename from src/test/regress/input/largeobject.source
rename to src/test/regress/sql/largeobject.sql
diff --git a/src/test/regress/input/misc.source b/src/test/regress/sql/misc.sql
similarity index 100%
rename from src/test/regress/input/misc.source
rename to src/test/regress/sql/misc.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