diff --git a/pre-inst-env.in b/build-aux/pre-inst-env.in
similarity index 100%
rename from pre-inst-env.in
rename to build-aux/pre-inst-env.in
diff --git a/test-env.in b/build-aux/test-env.in
similarity index 100%
rename from test-env.in
rename to build-aux/test-env.in
diff --git a/configure.ac b/configure.ac
index 6296b1f2ca..7c6fcc9ec9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,8 +211,9 @@ AC_CONFIG_FILES([Makefile
 		 guix/config.scm])
 
 AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
-AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
-AC_CONFIG_FILES([test-env],     [chmod +x test-env])
+AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
+AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
+  [chmod +x pre-inst-env])
 
 dnl Emacs interface.
 AC_PATH_PROG([DOT_USER_PROGRAM], [dot], [dot])