275 files changed, 560 insertions, 198 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 9a2a14c..5c05705 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -111,6 +111,104 @@
             ..
             m4
             ..
+            make
+                archives
+                    fmt_44bsd
+                    ..
+                    fmt_44bsd_mod
+                    ..
+                    fmt_oldbsd
+                    ..
+                ..
+                basic
+                    t0
+                    ..
+                    t1
+                    ..
+                    t2
+                    ..
+                    t3
+                    ..
+                ..
+                execution
+                    ellipsis
+                    ..
+                    empty
+                    ..
+                    joberr
+                    ..
+                    plus
+                    ..
+                ..
+                shell
+                    builtin
+                    ..
+                    meta
+                    ..
+                    path
+                    ..
+                    path_select
+                    ..
+                    replace
+                    ..
+                    select
+                    ..
+                ..
+                suffixes
+                    basic
+                    ..
+                    src_wild1
+                    ..
+                    src_wild2
+                    ..
+                ..
+                syntax
+                    directive-t0
+                    ..
+                    enl
+                    ..
+                    funny-targets
+                    ..
+                    semi
+                    ..
+                ..
+                sysmk
+                    t0
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                    t1
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                    t2
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                ..
+                variables
+                    modifier_M
+                    ..
+                    modifier_t
+                    ..
+                    opt_V
+                    ..
+                    t0
+                    ..
+                ..
+            ..
             ncal
             ..
             printf
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 6f34d31..d787cb9 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4129,6 +4129,376 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
+.if ${MK_MAKE} == yes && ${MK_BMAKE} == yes
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/common.sh
+OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
+OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
+OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
+OLD_DIRS+=usr/tests/usr.bin/make/variables
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
+OLD_DIRS+=usr/tests/usr.bin/make/syntax
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes
+OLD_DIRS+=usr/tests/usr.bin/make/shell/select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path
+OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
+OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
+OLD_DIRS+=usr/tests/usr.bin/make/shell
+OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
+OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
+OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
+OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
+OLD_DIRS+=usr/tests/usr.bin/make/execution
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
+OLD_DIRS+=usr/tests/usr.bin/make/basic
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives
+OLD_DIRS+=usr/tests/usr.bin/make
+.endif
 .else
 # ATF libraries.
 OLD_FILES+=usr/bin/atf-sh
diff --git a/tools/regression/usr.bin/make/all.sh b/tools/regression/usr.bin/make/all.sh
deleted file mode 100755
index 42f9e73..0000000
--- a/tools/regression/usr.bin/make/all.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# find all test scripts below our current directory
-SCRIPTS=`find . -name test.t`
-
-if [ -z "${SCRIPTS}" ] ; then
-	exit 0
-fi
-
-for i in ${SCRIPTS} ; do
-	(
-	cd `dirname $i`
-	sh ./test.t $1
-	)
-done
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 4605bb3..9b8290c 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -118,4 +118,8 @@ fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/tools/regression/usr.bin/make/README b/usr.bin/make/tests/README
index 32b4ddc..1ac209b 100644
--- a/tools/regression/usr.bin/make/README
+++ b/usr.bin/make/tests/README
@@ -2,9 +2,7 @@ $FreeBSD$
 
 This directory contains regression tests for make(1).
 
-To invoke the tests install prove(1) from ports/devel/p5-Test-Harness and
-run 'prove -r'. Alternatively one can use 'sh ./all.sh test' and scan the
-output for '^not ok'.
+To invoke the tests, please refer to tests(7).
 
 ----------------------------------------------------------------------------
 
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile b/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
index 5a8b065..5a8b065 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile
+++ b/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5
index 7b91643..7b91643 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6
index fd15190..fd15190 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t b/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
index eba6aed..2604c96 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t
+++ b/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Archive parsing (BSD4.4 format)."
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a b/usr.bin/make/tests/archives/fmt_44bsd/libtest.a
index 891ce6e..891ce6e 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a
+++ b/usr.bin/make/tests/archives/fmt_44bsd/libtest.a
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
index cd999da..cd999da 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5
index 7b91643..7b91643 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6
index fd15190..fd15190 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t b/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
index aa65a3e..bf13f22 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Archive parsing (modified BSD4.4 format)."
diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a b/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a
index 57bc407..57bc407 100644
--- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
+++ b/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
index b8f5116..b8f5116 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6
index fd15190..fd15190 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7
index cb572e1..cb572e1 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t b/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
index 03f7800..c7980c5 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Archive parsing (old BSD format)."
diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a b/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a
index 3434c53..3434c53 100644
--- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a
+++ b/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a
diff --git a/tools/regression/usr.bin/make/basic/t0/expected.status.1 b/usr.bin/make/tests/basic/t0/expected.status.1
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/basic/t0/expected.status.1
+++ b/usr.bin/make/tests/basic/t0/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 b/usr.bin/make/tests/basic/t0/expected.stderr.1
index 90280c8..90280c8 100644
--- a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t0/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 b/usr.bin/make/tests/basic/t0/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t0/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t0/test.t b/usr.bin/make/tests/basic/t0/legacy_test.sh
index d71a39a..d23418a 100644
--- a/tools/regression/usr.bin/make/basic/t0/test.t
+++ b/usr.bin/make/tests/basic/t0/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="An empty Makefile file and no target given."
diff --git a/tools/regression/usr.bin/make/basic/t1/Makefile b/usr.bin/make/tests/basic/t1/Makefile.test
index d120087..d120087 100644
--- a/tools/regression/usr.bin/make/basic/t1/Makefile
+++ b/usr.bin/make/tests/basic/t1/Makefile.test
diff --git a/tools/regression/usr.bin/make/basic/t1/expected.status.1 b/usr.bin/make/tests/basic/t1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/basic/t1/expected.status.1
+++ b/usr.bin/make/tests/basic/t1/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 b/usr.bin/make/tests/basic/t1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 b/usr.bin/make/tests/basic/t1/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t1/test.t b/usr.bin/make/tests/basic/t1/legacy_test.sh
index 4131f5d..b07f927 100644
--- a/tools/regression/usr.bin/make/basic/t1/test.t
+++ b/usr.bin/make/tests/basic/t1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="A Makefile file with only a 'all:' file dependency specification."
diff --git a/tools/regression/usr.bin/make/basic/t2/Makefile b/usr.bin/make/tests/basic/t2/Makefile.test
index ab8fe49..ab8fe49 100644
--- a/tools/regression/usr.bin/make/basic/t2/Makefile
+++ b/usr.bin/make/tests/basic/t2/Makefile.test
diff --git a/tools/regression/usr.bin/make/basic/t2/expected.status.1 b/usr.bin/make/tests/basic/t2/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/basic/t2/expected.status.1
+++ b/usr.bin/make/tests/basic/t2/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 b/usr.bin/make/tests/basic/t2/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t2/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 b/usr.bin/make/tests/basic/t2/expected.stdout.1
index e618540..e618540 100644
--- a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t2/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t2/test.t b/usr.bin/make/tests/basic/t2/legacy_test.sh
index f5866bb..da4c60a 100644
--- a/tools/regression/usr.bin/make/basic/t2/test.t
+++ b/usr.bin/make/tests/basic/t2/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="A Makefile file with only a 'all:' file dependency specification, and shell command."
diff --git a/tools/regression/usr.bin/make/basic/t3/expected.status.1 b/usr.bin/make/tests/basic/t3/expected.status.1
index 0cfbf08..0cfbf08 100644
--- a/tools/regression/usr.bin/make/basic/t3/expected.status.1
+++ b/usr.bin/make/tests/basic/t3/expected.status.1
diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 b/usr.bin/make/tests/basic/t3/expected.stderr.1
index 90280c8..90280c8 100644
--- a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1
+++ b/usr.bin/make/tests/basic/t3/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 b/usr.bin/make/tests/basic/t3/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1
+++ b/usr.bin/make/tests/basic/t3/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/basic/t3/test.t b/usr.bin/make/tests/basic/t3/legacy_test.sh
index 782d27c..3c41bb3 100644
--- a/tools/regression/usr.bin/make/basic/t3/test.t
+++ b/usr.bin/make/tests/basic/t3/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="No Makefile file, no command line target."
diff --git a/tools/regression/usr.bin/make/common.sh b/usr.bin/make/tests/common.sh
index cc7622e..5c5df1e 100644
--- a/tools/regression/usr.bin/make/common.sh
+++ b/usr.bin/make/tests/common.sh
@@ -1,8 +1,6 @@
-#!/bin/sh
+# $FreeBSD$
 #
 # Common code used run regression tests for usr.bin/make.
-#
-# $FreeBSD$
 
 #
 # Output a message and exit with an error.
@@ -99,8 +97,8 @@ common_setup()
 	#
 	# If a Makefile exists in the source directory - copy it over
 	#
-	if [ -e Makefile -a ! -e ${WORK_DIR}/Makefile ] ; then
-		cp Makefile ${WORK_DIR}/Makefile
+	if [ -e ${SRC_DIR}/Makefile.test -a ! -e ${WORK_DIR}/Makefile ] ; then
+		cp ${SRC_DIR}/Makefile.test ${WORK_DIR}/Makefile
 	fi
 
 	#
@@ -123,10 +121,11 @@ common_setup()
 	#
 	set -- ${TEST_COPY_FILES}
 	while [ $# -ne 0 ] ; do
-		if [ ! -e ${WORK_DIR}/${1} ] ; then
-			cp ${1} ${WORK_DIR}/${1}
+		local dstname="$(echo ${1} | sed -e 's,Makefile.test,Makefile,')"
+		if [ ! -e ${WORK_DIR}/${dstname} ] ; then
+			cp ${SRC_DIR}/${1} ${WORK_DIR}/${dstname}
 		fi
-		chmod ${2} ${WORK_DIR}/${1}
+		chmod ${2} ${WORK_DIR}/${dstname}
 		shift ; shift
 	done
 
@@ -338,23 +337,24 @@ eval_compare()
 		else
 			eval skip=\${TEST_${N}_SKIP}
 		fi
+		msg=
 		if [ ! -z "$fail" ]; then
-			echo -n "not "
+			msg="${msg}not "
 		fi
-		echo -n "ok ${N} ${SUBDIR}/${N}"
+		msg="${msg}ok ${N} ${SUBDIR}/${N}"
 		if [ ! -z "$fail" -o ! -z "$todo" -o ! -z "$skip" ]; then
-			echo -n " # "
+			msg="${msg} # "
 		fi
 		if [ ! -z "$skip" ] ; then
-			echo -n "skip $skip; "
+			msg="${msg}skip ${skip}; "
 		fi
 		if [ ! -z "$todo" ] ; then
-			echo -n "TODO $todo; "
+			msg="${msg}TODO ${todo}; "
 		fi
 		if [ ! -z "$fail" ] ; then
-			echo "reason: ${fail}"
+			msg="${msg}reason: ${fail}"
 		fi
-		echo
+		echo ${msg}
 		N=$((N + 1))
 	done
 }
@@ -368,11 +368,13 @@ eval_compare()
 do_compare()
 {
 	local EXPECTED RESULT
-	EXPECTED="expected.$1.$2"
+	EXPECTED="${SRC_DIR}/expected.$1.$2"
 	RESULT="${OUTPUT_DIR}/$1.$2"
 
 	if [ -f $EXPECTED ]; then
-		diff -q $EXPECTED $RESULT 1>/dev/null 2>/dev/null
+		cat $RESULT | sed -e "s,^$(basename $MAKE_PROG):,make:," | \
+		diff -u $EXPECTED -
+		#diff -q $EXPECTED - 1>/dev/null 2>/dev/null
 		return $?
 	else
 		return 1	# FAIL
@@ -412,7 +414,7 @@ eval_diff()
 do_diff()
 {
 	local EXPECTED RESULT
-	EXPECTED="expected.$1.$2"
+	EXPECTED="${SRC_DIR}/expected.$1.$2"
 	RESULT="${OUTPUT_DIR}/$1.$2"
 
 	echo diff -u $EXPECTED $RESULT
@@ -513,49 +515,16 @@ eval_cmd()
 #
 
 #
-# Parse command line arguments.
-#
-args=`getopt m:w:v $*`
-if [ $? != 0 ]; then
-	echo 'Usage: ...'
-	exit 2
-fi
-set -- $args
-for i; do
-	case "$i" in
-	-m)
-		MAKE_PROG="$2"
-		shift
-		shift
-		;;
-	-w)
-		WORK_BASE="$2"
-		shift
-		shift
-		;;
-	-v)
-		VERBOSE=1
-		shift
-		;;
-	--)
-		shift
-		break
-		;;
-	esac
-done
-
-#
 # Determine our sub-directory. Argh.
 #
-SRC_DIR=`pwd`
-SRC_BASE=`while [ ! -f common.sh ] ; do cd .. ; done ; pwd`
+SRC_DIR=$(dirname $0)
+SRC_BASE=`cd ${SRC_DIR} ; while [ ! -f common.sh ] ; do cd .. ; done ; pwd`
 SUBDIR=`echo ${SRC_DIR} | sed "s@${SRC_BASE}/@@"`
 
 #
 # Construct working directory
 #
-WORK_BASE=${WORK_BASE:-"/tmp/$USER.make.test"}
-WORK_DIR=${WORK_BASE}/${SUBDIR}
+WORK_DIR=$(pwd)/work/${SUBDIR}
 OUTPUT_DIR=${WORK_DIR}.OUTPUT
 
 #
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/Makefile b/usr.bin/make/tests/execution/ellipsis/Makefile.test
index d19f642..d19f642 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/Makefile
+++ b/usr.bin/make/tests/execution/ellipsis/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 b/usr.bin/make/tests/execution/ellipsis/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1
+++ b/usr.bin/make/tests/execution/ellipsis/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 b/usr.bin/make/tests/execution/ellipsis/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1
+++ b/usr.bin/make/tests/execution/ellipsis/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 b/usr.bin/make/tests/execution/ellipsis/expected.stdout.1
index a7e5727..a7e5727 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1
+++ b/usr.bin/make/tests/execution/ellipsis/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/ellipsis/test.t b/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
index c042995..9e9cd01 100644
--- a/tools/regression/usr.bin/make/execution/ellipsis/test.t
+++ b/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Ellipsis command from variable"
diff --git a/tools/regression/usr.bin/make/execution/empty/Makefile b/usr.bin/make/tests/execution/empty/Makefile.test
index f687bce..f687bce 100644
--- a/tools/regression/usr.bin/make/execution/empty/Makefile
+++ b/usr.bin/make/tests/execution/empty/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/empty/expected.status.1 b/usr.bin/make/tests/execution/empty/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/empty/expected.status.1
+++ b/usr.bin/make/tests/execution/empty/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 b/usr.bin/make/tests/execution/empty/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1
+++ b/usr.bin/make/tests/execution/empty/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 b/usr.bin/make/tests/execution/empty/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1
+++ b/usr.bin/make/tests/execution/empty/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/empty/test.t b/usr.bin/make/tests/execution/empty/legacy_test.sh
index 433d342..e02d175 100644
--- a/tools/regression/usr.bin/make/execution/empty/test.t
+++ b/usr.bin/make/tests/execution/empty/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Empty command (from variable)"
diff --git a/tools/regression/usr.bin/make/execution/joberr/Makefile b/usr.bin/make/tests/execution/joberr/Makefile.test
index aca86e8..aca86e8 100644
--- a/tools/regression/usr.bin/make/execution/joberr/Makefile
+++ b/usr.bin/make/tests/execution/joberr/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.status.1 b/usr.bin/make/tests/execution/joberr/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/joberr/expected.status.1
+++ b/usr.bin/make/tests/execution/joberr/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 b/usr.bin/make/tests/execution/joberr/expected.stderr.1
index d0c8a2e..d0c8a2e 100644
--- a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1
+++ b/usr.bin/make/tests/execution/joberr/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 b/usr.bin/make/tests/execution/joberr/expected.stdout.1
index 0ee28f4..0ee28f4 100644
--- a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1
+++ b/usr.bin/make/tests/execution/joberr/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/joberr/test.t b/usr.bin/make/tests/execution/joberr/legacy_test.sh
index 8e07958..429bfe1 100644
--- a/tools/regression/usr.bin/make/execution/joberr/test.t
+++ b/usr.bin/make/tests/execution/joberr/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test job make error output"
diff --git a/tools/regression/usr.bin/make/execution/plus/Makefile b/usr.bin/make/tests/execution/plus/Makefile.test
index ae3bdc3..ae3bdc3 100644
--- a/tools/regression/usr.bin/make/execution/plus/Makefile
+++ b/usr.bin/make/tests/execution/plus/Makefile.test
diff --git a/tools/regression/usr.bin/make/execution/plus/expected.status.1 b/usr.bin/make/tests/execution/plus/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/execution/plus/expected.status.1
+++ b/usr.bin/make/tests/execution/plus/expected.status.1
diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 b/usr.bin/make/tests/execution/plus/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1
+++ b/usr.bin/make/tests/execution/plus/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 b/usr.bin/make/tests/execution/plus/expected.stdout.1
index b334fc7..b334fc7 100644
--- a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1
+++ b/usr.bin/make/tests/execution/plus/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/execution/plus/test.t b/usr.bin/make/tests/execution/plus/legacy_test.sh
index e75b4b9..0737d1b 100644
--- a/tools/regression/usr.bin/make/execution/plus/test.t
+++ b/usr.bin/make/tests/execution/plus/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test '+command' execution with -n -jX"
diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/usr.bin/make/tests/shell/builtin/Makefile.test
index 0376478..0376478 100644
--- a/tools/regression/usr.bin/make/shell/builtin/Makefile
+++ b/usr.bin/make/tests/shell/builtin/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.1 b/usr.bin/make/tests/shell/builtin/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status.1
+++ b/usr.bin/make/tests/shell/builtin/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.2 b/usr.bin/make/tests/shell/builtin/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.status.2
+++ b/usr.bin/make/tests/shell/builtin/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 b/usr.bin/make/tests/shell/builtin/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1
+++ b/usr.bin/make/tests/shell/builtin/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 b/usr.bin/make/tests/shell/builtin/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2
+++ b/usr.bin/make/tests/shell/builtin/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 b/usr.bin/make/tests/shell/builtin/expected.stdout.1
index 9c558e3..9c558e3 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1
+++ b/usr.bin/make/tests/shell/builtin/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 b/usr.bin/make/tests/shell/builtin/expected.stdout.2
index e350eaf..e350eaf 100644
--- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2
+++ b/usr.bin/make/tests/shell/builtin/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/usr.bin/make/tests/shell/builtin/legacy_test.sh
index 1798afc..6347583 100644
--- a/tools/regression/usr.bin/make/shell/builtin/test.t
+++ b/usr.bin/make/tests/shell/builtin/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Check that a command line with a builtin is passed to the shell."
diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/usr.bin/make/tests/shell/builtin/sh
index 3a507b87..3a507b87 100644
--- a/tools/regression/usr.bin/make/shell/builtin/sh
+++ b/usr.bin/make/tests/shell/builtin/sh
diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/usr.bin/make/tests/shell/meta/Makefile.test
index bcf19d0..bcf19d0 100644
--- a/tools/regression/usr.bin/make/shell/meta/Makefile
+++ b/usr.bin/make/tests/shell/meta/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.1 b/usr.bin/make/tests/shell/meta/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.status.1
+++ b/usr.bin/make/tests/shell/meta/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.2 b/usr.bin/make/tests/shell/meta/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.status.2
+++ b/usr.bin/make/tests/shell/meta/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 b/usr.bin/make/tests/shell/meta/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1
+++ b/usr.bin/make/tests/shell/meta/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 b/usr.bin/make/tests/shell/meta/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2
+++ b/usr.bin/make/tests/shell/meta/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 b/usr.bin/make/tests/shell/meta/expected.stdout.1
index 9c558e3..9c558e3 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1
+++ b/usr.bin/make/tests/shell/meta/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 b/usr.bin/make/tests/shell/meta/expected.stdout.2
index 6ac6f19..6ac6f19 100644
--- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2
+++ b/usr.bin/make/tests/shell/meta/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/usr.bin/make/tests/shell/meta/legacy_test.sh
index 588b73c..41cd763 100644
--- a/tools/regression/usr.bin/make/shell/meta/test.t
+++ b/usr.bin/make/tests/shell/meta/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Check that a command line with meta characters is passed to the shell."
diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/usr.bin/make/tests/shell/meta/sh
index 3a507b87..3a507b87 100644
--- a/tools/regression/usr.bin/make/shell/meta/sh
+++ b/usr.bin/make/tests/shell/meta/sh
diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/usr.bin/make/tests/shell/path/Makefile.test
index fe40b64..fe40b64 100644
--- a/tools/regression/usr.bin/make/shell/path/Makefile
+++ b/usr.bin/make/tests/shell/path/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.1 b/usr.bin/make/tests/shell/path/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.status.1
+++ b/usr.bin/make/tests/shell/path/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.2 b/usr.bin/make/tests/shell/path/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.status.2
+++ b/usr.bin/make/tests/shell/path/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.1 b/usr.bin/make/tests/shell/path/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr.1
+++ b/usr.bin/make/tests/shell/path/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.2 b/usr.bin/make/tests/shell/path/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stderr.2
+++ b/usr.bin/make/tests/shell/path/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 b/usr.bin/make/tests/shell/path/expected.stdout.1
index d881364..d881364 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout.1
+++ b/usr.bin/make/tests/shell/path/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.2 b/usr.bin/make/tests/shell/path/expected.stdout.2
index de3fc89..de3fc89 100644
--- a/tools/regression/usr.bin/make/shell/path/expected.stdout.2
+++ b/usr.bin/make/tests/shell/path/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/usr.bin/make/tests/shell/path/legacy_test.sh
index 72ff252..9289a8d 100644
--- a/tools/regression/usr.bin/make/shell/path/test.t
+++ b/usr.bin/make/tests/shell/path/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="New path for builtin shells."
diff --git a/tools/regression/usr.bin/make/shell/path/sh b/usr.bin/make/tests/shell/path/sh
index 46169eb..46169eb 100644
--- a/tools/regression/usr.bin/make/shell/path/sh
+++ b/usr.bin/make/tests/shell/path/sh
diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/usr.bin/make/tests/shell/path_select/Makefile.test
index 05cfb27..05cfb27 100644
--- a/tools/regression/usr.bin/make/shell/path_select/Makefile
+++ b/usr.bin/make/tests/shell/path_select/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.1 b/usr.bin/make/tests/shell/path_select/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status.1
+++ b/usr.bin/make/tests/shell/path_select/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.2 b/usr.bin/make/tests/shell/path_select/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.status.2
+++ b/usr.bin/make/tests/shell/path_select/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 b/usr.bin/make/tests/shell/path_select/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1
+++ b/usr.bin/make/tests/shell/path_select/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 b/usr.bin/make/tests/shell/path_select/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2
+++ b/usr.bin/make/tests/shell/path_select/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 b/usr.bin/make/tests/shell/path_select/expected.stdout.1
index d881364..d881364 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1
+++ b/usr.bin/make/tests/shell/path_select/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 b/usr.bin/make/tests/shell/path_select/expected.stdout.2
index de3fc89..de3fc89 100644
--- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2
+++ b/usr.bin/make/tests/shell/path_select/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/usr.bin/make/tests/shell/path_select/legacy_test.sh
index 5bac631..6b75b90 100644
--- a/tools/regression/usr.bin/make/shell/path_select/test.t
+++ b/usr.bin/make/tests/shell/path_select/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="New path for builtin shells (2)."
diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/usr.bin/make/tests/shell/path_select/shell
index 46169eb..46169eb 100644
--- a/tools/regression/usr.bin/make/shell/path_select/shell
+++ b/usr.bin/make/tests/shell/path_select/shell
diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/usr.bin/make/tests/shell/replace/Makefile.test
index 2160dbf..2160dbf 100644
--- a/tools/regression/usr.bin/make/shell/replace/Makefile
+++ b/usr.bin/make/tests/shell/replace/Makefile.test
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.1 b/usr.bin/make/tests/shell/replace/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.status.1
+++ b/usr.bin/make/tests/shell/replace/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.2 b/usr.bin/make/tests/shell/replace/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.status.2
+++ b/usr.bin/make/tests/shell/replace/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 b/usr.bin/make/tests/shell/replace/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1
+++ b/usr.bin/make/tests/shell/replace/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 b/usr.bin/make/tests/shell/replace/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2
+++ b/usr.bin/make/tests/shell/replace/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 b/usr.bin/make/tests/shell/replace/expected.stdout.1
index eff99ea..eff99ea 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1
+++ b/usr.bin/make/tests/shell/replace/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 b/usr.bin/make/tests/shell/replace/expected.stdout.2
index c79a09a..c79a09a 100644
--- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2
+++ b/usr.bin/make/tests/shell/replace/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/usr.bin/make/tests/shell/replace/legacy_test.sh
index 5c91cf9..880ca78 100644
--- a/tools/regression/usr.bin/make/shell/replace/test.t
+++ b/usr.bin/make/tests/shell/replace/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Check that the shell can be replaced."
diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/usr.bin/make/tests/shell/replace/shell
index 46169eb..46169eb 100644
--- a/tools/regression/usr.bin/make/shell/replace/shell
+++ b/usr.bin/make/tests/shell/replace/shell
diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/usr.bin/make/tests/shell/select/Makefile.test
index e1ff023..74d96e1 100644
--- a/tools/regression/usr.bin/make/shell/select/Makefile
+++ b/usr.bin/make/tests/shell/select/Makefile.test
@@ -25,4 +25,4 @@ ksh_test: print_path
 .endif
 
 print_path:
-	@ps -opid,command | awk '$$1=='$$$$' { print $$2; }'
+	@ps -x -opid,command | awk '$$1=='$$$$' { print $$2; }'
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.1 b/usr.bin/make/tests/shell/select/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.status.1
+++ b/usr.bin/make/tests/shell/select/expected.status.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.2 b/usr.bin/make/tests/shell/select/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.status.2
+++ b/usr.bin/make/tests/shell/select/expected.status.2
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.1 b/usr.bin/make/tests/shell/select/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr.1
+++ b/usr.bin/make/tests/shell/select/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 b/usr.bin/make/tests/shell/select/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stderr.2
+++ b/usr.bin/make/tests/shell/select/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 b/usr.bin/make/tests/shell/select/expected.stdout.1
index c2cdaa0..c2cdaa0 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout.1
+++ b/usr.bin/make/tests/shell/select/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.2 b/usr.bin/make/tests/shell/select/expected.stdout.2
index 5a831e8..5a831e8 100644
--- a/tools/regression/usr.bin/make/shell/select/expected.stdout.2
+++ b/usr.bin/make/tests/shell/select/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/usr.bin/make/tests/shell/select/legacy_test.sh
index 7f73f9b..46d3eaf 100644
--- a/tools/regression/usr.bin/make/shell/select/test.t
+++ b/usr.bin/make/tests/shell/select/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Select the builtin sh shell."
diff --git a/tools/regression/usr.bin/make/suffixes/basic/Makefile b/usr.bin/make/tests/suffixes/basic/Makefile.test
index 45d9130..45d9130 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/Makefile
+++ b/usr.bin/make/tests/suffixes/basic/Makefile.test
diff --git a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a b/usr.bin/make/tests/suffixes/basic/TEST1.a
index da5569b..da5569b 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a
+++ b/usr.bin/make/tests/suffixes/basic/TEST1.a
diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 b/usr.bin/make/tests/suffixes/basic/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1
+++ b/usr.bin/make/tests/suffixes/basic/expected.status.1
diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 b/usr.bin/make/tests/suffixes/basic/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1
+++ b/usr.bin/make/tests/suffixes/basic/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 b/usr.bin/make/tests/suffixes/basic/expected.stdout.1
index 582927e..582927e 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1
+++ b/usr.bin/make/tests/suffixes/basic/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/suffixes/basic/test.t b/usr.bin/make/tests/suffixes/basic/legacy_test.sh
index 0b387c8..3446bf0 100644
--- a/tools/regression/usr.bin/make/suffixes/basic/test.t
+++ b/usr.bin/make/tests/suffixes/basic/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Basic suffix operation."
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile b/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
index d0258ad..d0258ad 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile
+++ b/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a b/usr.bin/make/tests/suffixes/src_wild1/TEST1.a
index da5569b..da5569b 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a
+++ b/usr.bin/make/tests/suffixes/src_wild1/TEST1.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a b/usr.bin/make/tests/suffixes/src_wild1/TEST2.a
index 34f8508..34f8508 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a
+++ b/usr.bin/make/tests/suffixes/src_wild1/TEST2.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1
+++ b/usr.bin/make/tests/suffixes/src_wild1/expected.status.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1
+++ b/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 b/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1
index 3cd2129..3cd2129 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1
+++ b/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t b/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
index 6b31118..053cc6c 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t
+++ b/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Source wildcard expansion."
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile b/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
index 1dea7ea..1dea7ea 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile
+++ b/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a b/usr.bin/make/tests/suffixes/src_wild2/TEST1.a
index da5569b..da5569b 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a
+++ b/usr.bin/make/tests/suffixes/src_wild2/TEST1.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a b/usr.bin/make/tests/suffixes/src_wild2/TEST2.a
index 34f8508..34f8508 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a
+++ b/usr.bin/make/tests/suffixes/src_wild2/TEST2.a
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1
+++ b/usr.bin/make/tests/suffixes/src_wild2/expected.status.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1
+++ b/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 b/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1
index 3cd2129..3cd2129 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1
+++ b/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t b/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
index 0d40e3d..03cff93 100644
--- a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t
+++ b/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Source wildcard expansion (2)."
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile.test
index 0f95a21..0f95a21 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile
+++ b/usr.bin/make/tests/syntax/directive-t0/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 b/usr.bin/make/tests/syntax/directive-t0/expected.status.1
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1
+++ b/usr.bin/make/tests/syntax/directive-t0/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 b/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1
index de66fcc..de66fcc 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 b/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/test.t b/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
index 4b71de3..451c876 100644
--- a/tools/regression/usr.bin/make/syntax/directive-t0/test.t
+++ b/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
@@ -1,8 +1,7 @@
 #! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="A typo'ed directive."
diff --git a/tools/regression/usr.bin/make/syntax/enl/Makefile b/usr.bin/make/tests/syntax/enl/Makefile.test
index a7c6955..a7c6955 100644
--- a/tools/regression/usr.bin/make/syntax/enl/Makefile
+++ b/usr.bin/make/tests/syntax/enl/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.1 b/usr.bin/make/tests/syntax/enl/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.1
+++ b/usr.bin/make/tests/syntax/enl/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.2 b/usr.bin/make/tests/syntax/enl/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.2
+++ b/usr.bin/make/tests/syntax/enl/expected.status.2
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.3 b/usr.bin/make/tests/syntax/enl/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.3
+++ b/usr.bin/make/tests/syntax/enl/expected.status.3
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.4 b/usr.bin/make/tests/syntax/enl/expected.status.4
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.4
+++ b/usr.bin/make/tests/syntax/enl/expected.status.4
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.5 b/usr.bin/make/tests/syntax/enl/expected.status.5
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.status.5
+++ b/usr.bin/make/tests/syntax/enl/expected.status.5
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 b/usr.bin/make/tests/syntax/enl/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 b/usr.bin/make/tests/syntax/enl/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 b/usr.bin/make/tests/syntax/enl/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 b/usr.bin/make/tests/syntax/enl/expected.stderr.4
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.4
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 b/usr.bin/make/tests/syntax/enl/expected.stderr.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5
+++ b/usr.bin/make/tests/syntax/enl/expected.stderr.5
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 b/usr.bin/make/tests/syntax/enl/expected.stdout.1
index 9766475..9766475 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 b/usr.bin/make/tests/syntax/enl/expected.stdout.2
index 9766475..9766475 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 b/usr.bin/make/tests/syntax/enl/expected.stdout.3
index 422c2b7..422c2b7 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 b/usr.bin/make/tests/syntax/enl/expected.stdout.4
index b2901ea..b2901ea 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.4
diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 b/usr.bin/make/tests/syntax/enl/expected.stdout.5
index 5120076..5120076 100644
--- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5
+++ b/usr.bin/make/tests/syntax/enl/expected.stdout.5
diff --git a/tools/regression/usr.bin/make/syntax/enl/test.t b/usr.bin/make/tests/syntax/enl/legacy_test.sh
index 2e5d12c..307c1f0 100644
--- a/tools/regression/usr.bin/make/syntax/enl/test.t
+++ b/usr.bin/make/tests/syntax/enl/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test escaped new-lines handling."
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile b/usr.bin/make/tests/syntax/funny-targets/Makefile.test
index 064ab3a..064ab3a 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile
+++ b/usr.bin/make/tests/syntax/funny-targets/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 b/usr.bin/make/tests/syntax/funny-targets/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 b/usr.bin/make/tests/syntax/funny-targets/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.status.2
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1
index 09cb232..09cb232 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2
index b2f0364..b2f0364 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2
+++ b/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/test.t b/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
index ec7e75c..e9cd317 100644
--- a/tools/regression/usr.bin/make/syntax/funny-targets/test.t
+++ b/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC='Target names with "funny" embeded characters.'
diff --git a/tools/regression/usr.bin/make/syntax/semi/Makefile b/usr.bin/make/tests/syntax/semi/Makefile.test
index 12f5225..12f5225 100644
--- a/tools/regression/usr.bin/make/syntax/semi/Makefile
+++ b/usr.bin/make/tests/syntax/semi/Makefile.test
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.1 b/usr.bin/make/tests/syntax/semi/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.status.1
+++ b/usr.bin/make/tests/syntax/semi/expected.status.1
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.2 b/usr.bin/make/tests/syntax/semi/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.status.2
+++ b/usr.bin/make/tests/syntax/semi/expected.status.2
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 b/usr.bin/make/tests/syntax/semi/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1
+++ b/usr.bin/make/tests/syntax/semi/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 b/usr.bin/make/tests/syntax/semi/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2
+++ b/usr.bin/make/tests/syntax/semi/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 b/usr.bin/make/tests/syntax/semi/expected.stdout.1
index 12b9617..12b9617 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1
+++ b/usr.bin/make/tests/syntax/semi/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 b/usr.bin/make/tests/syntax/semi/expected.stdout.2
index be0fa55..be0fa55 100644
--- a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2
+++ b/usr.bin/make/tests/syntax/semi/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/syntax/semi/test.t b/usr.bin/make/tests/syntax/semi/legacy_test.sh
index f52c9ab..092635a 100644
--- a/tools/regression/usr.bin/make/syntax/semi/test.t
+++ b/usr.bin/make/tests/syntax/semi/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Test semicolon handling."
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile b/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
index fc95f46..fc95f46 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile
+++ b/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1
+++ b/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
+++ b/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1
index 6f29307..6f29307 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
+++ b/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t b/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
index 9a78157..0214842 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t
+++ b/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../../../common.sh
+. $(dirname $0)/../../../../common.sh
 
 # Description
 DESC="Can we traverse up to / and find a 'mk/sys.mk'?"
diff --git a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk b/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
index 60f1955..60f1955 100644
--- a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk
+++ b/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup b/usr.bin/make/tests/sysmk/t1/2/1/cleanup
index c3d58b7..c3d58b7 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup
+++ b/usr.bin/make/tests/sysmk/t1/2/1/cleanup
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1
+++ b/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
+++ b/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1
index 6f29307..6f29307 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
+++ b/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t b/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
index ad1584f..fb73851 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t
+++ b/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../../../common.sh
+. $(dirname $0)/../../../../common.sh
 
 # Description
 DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?"
@@ -12,7 +10,7 @@ DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?"
 TEST_N=1
 TEST_1="-C ../../../t0/2/1 -m .../mk"
 TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755"
-TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644"
+TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile.test 644"
 TEST_CLEAN_FILES="../../../t0/2/1"
 TEST_CLEANUP=clean-special
 
diff --git a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk b/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
index 99b8ecc..99b8ecc 100644
--- a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk
+++ b/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup b/usr.bin/make/tests/sysmk/t2/2/1/cleanup
index c3d58b7..c3d58b7 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup
+++ b/usr.bin/make/tests/sysmk/t2/2/1/cleanup
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1
+++ b/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
+++ b/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 b/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1
index 70f1be3..70f1be3 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
+++ b/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t b/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
index 2c4dff3..ca817d8 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t
+++ b/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../../../common.sh
+. $(dirname $0)/../../../../common.sh
 
 # Description
 DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?"
@@ -12,7 +10,7 @@ DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?"
 TEST_N=1
 TEST_1="-m .../mk -C ../../../t0/2/1"
 TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755"
-TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644"
+TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile.test 644"
 TEST_CLEAN_FILES="../../../t0/2/1"
 TEST_CLEANUP=clean-special
 
diff --git a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk b/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
index 55632fd..55632fd 100644
--- a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk
+++ b/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
diff --git a/tools/regression/usr.bin/make/test-new.mk b/usr.bin/make/tests/test-new.mk
index f200833..f200833 100644
--- a/tools/regression/usr.bin/make/test-new.mk
+++ b/usr.bin/make/tests/test-new.mk
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile.test
index 34d4cd4..34d4cd4 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/Makefile
+++ b/usr.bin/make/tests/variables/modifier_M/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 b/usr.bin/make/tests/variables/modifier_M/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1
+++ b/usr.bin/make/tests/variables/modifier_M/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 b/usr.bin/make/tests/variables/modifier_M/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1
+++ b/usr.bin/make/tests/variables/modifier_M/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 b/usr.bin/make/tests/variables/modifier_M/expected.stdout.1
index b29e6df..b29e6df 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
+++ b/usr.bin/make/tests/variables/modifier_M/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/test.t b/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
index 979778f..6a3e68f 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/test.t
+++ b/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion with M modifier"
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/Makefile b/usr.bin/make/tests/variables/modifier_t/Makefile.test
index 53844ee..53844ee 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/Makefile
+++ b/usr.bin/make/tests/variables/modifier_t/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 b/usr.bin/make/tests/variables/modifier_t/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1
+++ b/usr.bin/make/tests/variables/modifier_t/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 b/usr.bin/make/tests/variables/modifier_t/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2
+++ b/usr.bin/make/tests/variables/modifier_t/expected.status.2
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 b/usr.bin/make/tests/variables/modifier_t/expected.status.3
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3
+++ b/usr.bin/make/tests/variables/modifier_t/expected.status.3
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 b/usr.bin/make/tests/variables/modifier_t/expected.stderr.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stderr.3
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.1
index dff38fd..dff38fd 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.2
index 71a0f60..71a0f60 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 b/usr.bin/make/tests/variables/modifier_t/expected.stdout.3
index 6434c7b..6434c7b 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3
+++ b/usr.bin/make/tests/variables/modifier_t/expected.stdout.3
diff --git a/tools/regression/usr.bin/make/variables/modifier_t/test.t b/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
index f564f6e..7f14571 100644
--- a/tools/regression/usr.bin/make/variables/modifier_t/test.t
+++ b/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion with t modifiers"
diff --git a/tools/regression/usr.bin/make/variables/opt_V/Makefile b/usr.bin/make/tests/variables/opt_V/Makefile.test
index 128e511..128e511 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/Makefile
+++ b/usr.bin/make/tests/variables/opt_V/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 b/usr.bin/make/tests/variables/opt_V/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1
+++ b/usr.bin/make/tests/variables/opt_V/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 b/usr.bin/make/tests/variables/opt_V/expected.status.2
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2
+++ b/usr.bin/make/tests/variables/opt_V/expected.status.2
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 b/usr.bin/make/tests/variables/opt_V/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1
+++ b/usr.bin/make/tests/variables/opt_V/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 b/usr.bin/make/tests/variables/opt_V/expected.stderr.2
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2
+++ b/usr.bin/make/tests/variables/opt_V/expected.stderr.2
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 b/usr.bin/make/tests/variables/opt_V/expected.stdout.1
index 050db40..050db40 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1
+++ b/usr.bin/make/tests/variables/opt_V/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 b/usr.bin/make/tests/variables/opt_V/expected.stdout.2
index 4da2aef..4da2aef 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2
+++ b/usr.bin/make/tests/variables/opt_V/expected.stdout.2
diff --git a/tools/regression/usr.bin/make/variables/opt_V/test.t b/usr.bin/make/tests/variables/opt_V/legacy_test.sh
index 32a74b6..4b1122a 100644
--- a/tools/regression/usr.bin/make/variables/opt_V/test.t
+++ b/usr.bin/make/tests/variables/opt_V/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion using command line '-V'"
diff --git a/tools/regression/usr.bin/make/variables/t0/Makefile b/usr.bin/make/tests/variables/t0/Makefile.test
index 1cc58ee..1cc58ee 100644
--- a/tools/regression/usr.bin/make/variables/t0/Makefile
+++ b/usr.bin/make/tests/variables/t0/Makefile.test
diff --git a/tools/regression/usr.bin/make/variables/t0/expected.status.1 b/usr.bin/make/tests/variables/t0/expected.status.1
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/make/variables/t0/expected.status.1
+++ b/usr.bin/make/tests/variables/t0/expected.status.1
diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 b/usr.bin/make/tests/variables/t0/expected.stderr.1
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1
+++ b/usr.bin/make/tests/variables/t0/expected.stderr.1
diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 b/usr.bin/make/tests/variables/t0/expected.stdout.1
index e2c70de..e2c70de 100644
--- a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1
+++ b/usr.bin/make/tests/variables/t0/expected.stdout.1
diff --git a/tools/regression/usr.bin/make/variables/t0/test.t b/usr.bin/make/tests/variables/t0/legacy_test.sh
index 7e4f427..8c78e2d 100644
--- a/tools/regression/usr.bin/make/variables/t0/test.t
+++ b/usr.bin/make/tests/variables/t0/legacy_test.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
-
+#! /bin/sh
 # $FreeBSD$
 
-cd `dirname $0`
-. ../../common.sh
+. $(dirname $0)/../../common.sh
 
 # Description
 DESC="Variable expansion."