diff --git a/config_flags_pm.com b/tests/config_flags_pm.com
similarity index 94%
rename from config_flags_pm.com
rename to tests/config_flags_pm.com
index 75e0da9d..3f5adffe 100755
--- a/config_flags_pm.com
+++ b/tests/config_flags_pm.com
@@ -20,9 +20,9 @@ $! You should have received a copy of the GNU General Public License along with
 $! this program.  If not, see <http://www.gnu.org/licenses/>.
 $!
 $!
-$ open/read cfpm_in [.tests]config-flags.pm.in
+$ open/read cfpm_in config-flags.pm.in
 $!
-$ outfile = "sys$disk:[.tests]config-flags.pm"
+$ outfile = "sys$disk:[]config-flags.pm"
 $!
 $ cflags = "/include=([],[.glob]"
 $!
diff --git a/test_make.com b/tests/run_make_tests.com
similarity index 97%
rename from test_make.com
rename to tests/run_make_tests.com
index 257e863b..2f17f7f5 100755
--- a/test_make.com
+++ b/tests/run_make_tests.com
@@ -201,7 +201,7 @@ $ if help_flag .nes. ""
 $ then
 $   type sys$input
 $DECK
-This is a test script wrapper for the [.tests]run_make_tests.pl script.
+This is a test script wrapper for the run_make_tests.pl script.
 
 This wrapper makes sure that the DCL symbols and logical names needed to
 run the perl script are in place.
@@ -239,15 +239,16 @@ $ if no_gnv .or. no_perl then exit 44
 $!
 $!
 $ make := $bin:make.exe
+$ default = f$environment("DEFAULT")
+$ this = f$environment("PROCEDURE")
+$ on error then goto all_error
+$ set default 'f$parse(this,,,"DEVICE")''f$parse(this,,,"DIRECTORY")'
 $!
 $! Need to make sure that the config-flags.pm exists.
-$ if f$search("[.tests]config-flags.pm") .eqs. ""
+$ if f$search("config-flags.pm") .eqs. ""
 $ then
 $   @config_flags_pm.com
 $ endif
-$ default = f$environment("DEFAULT")
-$ on error then goto all_error
-$ set def [.tests]
 $ define/user bin 'default',gnv$gnu:[bin]
 $ define/user decc$filename_unix_noversion enable
 $ define/user decc$filename_unix_report enable