Move old fmake tests into bmake and hook them to the build.

This first step is mostly to prevent the code from rotting even further
and to ensure these do not get wiped when fmake's code is removed from
the tree.

These tests are currently being skipped because they detect the underlying
make is not fmake and thus disable themselves -- and the reason is that
some of the tests fail, possibly due to legitimate bugs.  Enabling them to
run against bmake will come separately.

Lastly, it would be ideal if these tests were fed upstream but they are
not ready for that yet.  In the interim, just put them under usr.bin/bmake/
while we sort things out.  The existence of a different unit-tests directory
within here makes me feel less guilty about this.

Change confirmed working with a clean amd64 build.

325 files changed, 93 insertions, 92 deletions

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 2e6d30afa0cb..083054eb2748 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -133,21 +133,7 @@
                 atf-sh
                 ..
             ..
-            calendar
-            ..
-            comm
-            ..
-            file2c
-            ..
-            join
-            ..
-            jot
-            ..
-            lastcomm
-            ..
-            m4
-            ..
-            make
+            bmake
                 archives
                     fmt_44bsd
                     ..
@@ -245,6 +231,20 @@
                     ..
                 ..
             ..
+            calendar
+            ..
+            comm
+            ..
+            file2c
+            ..
+            join
+            ..
+            jot
+            ..
+            lastcomm
+            ..
+            m4
+            ..
             ncal
             ..
             printf
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 4d8fa38f738d..df5ae4b90216 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -3,6 +3,7 @@
 #
 # $FreeBSD$
 
+.include <src.opts.mk>
 .sinclude "Makefile.inc"
 
 SRCTOP?= ${.CURDIR:H:H}
@@ -106,6 +107,10 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
 SUBDIR+= unit-tests
 .endif
 
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
 
 MAN= ${PROG}.1
 MAN1= ${MAN}
diff --git a/usr.bin/make/tests/Makefile b/usr.bin/bmake/tests/Makefile
index d5bad60c7057..e22503467aa0 100644
--- a/usr.bin/make/tests/Makefile
+++ b/usr.bin/bmake/tests/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake
 
 FILESDIR=	${TESTSDIR}
 FILES=		common.sh
diff --git a/usr.bin/make/tests/README b/usr.bin/bmake/tests/README
index 1ac209b5715a..1ac209b5715a 100644
--- a/usr.bin/make/tests/README
+++ b/usr.bin/bmake/tests/README
diff --git a/usr.bin/make/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile
index f8944e0df62c..f80ffc2e8989 100644
--- a/usr.bin/make/tests/archives/Makefile
+++ b/usr.bin/bmake/tests/archives/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives
 
 TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
 
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
index ab1c38363b17..15389c802772 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile.test
index 5a8b065d20c9..5a8b065d20c9 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile.test
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.3
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.4
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.5
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.6
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.7
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.status.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.status.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.5
index 7b91643a3821..7b91643a3821 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.6
index fd1519039acc..fd1519039acc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.7
index cb572e189eb1..cb572e189eb1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stderr.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stderr.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.5
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.7
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/expected.stdout.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/expected.stdout.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_44bsd/legacy_test.sh
index 2604c9642b00..2604c9642b00 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/legacy_test.sh
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/libtest.a b/usr.bin/bmake/tests/archives/fmt_44bsd/libtest.a
index 891ce6e652d7..891ce6e652d7 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/libtest.a
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/libtest.a
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
index 8d63b6415ff9..1d2f6e272cdc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile.test
index cd999daaad4e..cd999daaad4e 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile.test
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.3
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.4
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.5
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.6
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.7
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.status.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.status.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.5
index 7b91643a3821..7b91643a3821 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.6
index fd1519039acc..fd1519039acc 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.7
index cb572e189eb1..cb572e189eb1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stderr.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stderr.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.1
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.1
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.2
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.2
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.3
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.3
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.4
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.4
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.5
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.5
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.5
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.6
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.6
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.7
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/expected.stdout.7
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/expected.stdout.7
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/legacy_test.sh
index bf13f228862b..bf13f228862b 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/legacy_test.sh
diff --git a/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/libtest.a
index 57bc407a2723..57bc407a2723 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd_mod/libtest.a
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/libtest.a
diff --git a/usr.bin/make/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
index bf6ad40969e9..2a96124193ca 100644
--- a/usr.bin/make/tests/archives/fmt_44bsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile.test
index b8f5116195ed..b8f5116195ed 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile.test
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.1
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.1
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.2
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.2
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.3
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.3
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.3
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.4
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.4
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.4
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.5
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.5
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.5
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.6
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.6
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.6
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.7
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.status.7
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.status.7
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.1
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.1
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.2
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.2
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.3
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.3
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.4
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.4
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.5
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.5
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.5
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.6
index fd1519039acc..fd1519039acc 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.6
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.6
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.7
index cb572e189eb1..cb572e189eb1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stderr.7
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stderr.7
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.1
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.1
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.2
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.2
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.3
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.3
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.4
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.4
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.5
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.5
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.5
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.6
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.6
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.6
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7 b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.7
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/expected.stdout.7
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/expected.stdout.7
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh b/usr.bin/bmake/tests/archives/fmt_oldbsd/legacy_test.sh
index c7980c54dc39..c7980c54dc39 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/legacy_test.sh
diff --git a/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a b/usr.bin/bmake/tests/archives/fmt_oldbsd/libtest.a
index 3434c53898a1..3434c53898a1 100644
--- a/usr.bin/make/tests/archives/fmt_oldbsd/libtest.a
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/libtest.a
diff --git a/usr.bin/make/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile
index fd7044e4de4d..56dfb33901c0 100644
--- a/usr.bin/make/tests/basic/Makefile
+++ b/usr.bin/bmake/tests/basic/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic
 
 TESTS_SUBDIRS=	t0 t1 t2 t3
 
diff --git a/usr.bin/make/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile
index 00c37570be90..12356596e374 100644
--- a/usr.bin/make/tests/basic/t3/Makefile
+++ b/usr.bin/bmake/tests/basic/t0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t3
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t0/expected.status.1 b/usr.bin/bmake/tests/basic/t0/expected.status.1
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/basic/t0/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t0/expected.status.1
diff --git a/usr.bin/make/tests/basic/t0/expected.stderr.1 b/usr.bin/bmake/tests/basic/t0/expected.stderr.1
index 90280c8298b9..90280c8298b9 100644
--- a/usr.bin/make/tests/basic/t0/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t0/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t0/expected.stdout.1 b/usr.bin/bmake/tests/basic/t0/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/basic/t0/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t0/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t0/legacy_test.sh b/usr.bin/bmake/tests/basic/t0/legacy_test.sh
index d23418afc132..d23418afc132 100644
--- a/usr.bin/make/tests/basic/t0/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t0/legacy_test.sh
diff --git a/usr.bin/make/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile
index 4b598ea78111..732dc65d91af 100644
--- a/usr.bin/make/tests/basic/t2/Makefile
+++ b/usr.bin/bmake/tests/basic/t1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t1/Makefile.test b/usr.bin/bmake/tests/basic/t1/Makefile.test
index d120087831ce..d120087831ce 100644
--- a/usr.bin/make/tests/basic/t1/Makefile.test
+++ b/usr.bin/bmake/tests/basic/t1/Makefile.test
diff --git a/usr.bin/make/tests/basic/t1/expected.status.1 b/usr.bin/bmake/tests/basic/t1/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/basic/t1/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t1/expected.status.1
diff --git a/usr.bin/make/tests/basic/t1/expected.stderr.1 b/usr.bin/bmake/tests/basic/t1/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/basic/t1/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t1/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t1/expected.stdout.1 b/usr.bin/bmake/tests/basic/t1/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/basic/t1/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t1/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t1/legacy_test.sh b/usr.bin/bmake/tests/basic/t1/legacy_test.sh
index b07f927a57cd..b07f927a57cd 100644
--- a/usr.bin/make/tests/basic/t1/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t1/legacy_test.sh
diff --git a/usr.bin/make/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile
index efd9030dfb60..58c36ff96f8d 100644
--- a/usr.bin/make/tests/basic/t1/Makefile
+++ b/usr.bin/bmake/tests/basic/t2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t2/Makefile.test b/usr.bin/bmake/tests/basic/t2/Makefile.test
index ab8fe4956e45..ab8fe4956e45 100644
--- a/usr.bin/make/tests/basic/t2/Makefile.test
+++ b/usr.bin/bmake/tests/basic/t2/Makefile.test
diff --git a/usr.bin/make/tests/basic/t2/expected.status.1 b/usr.bin/bmake/tests/basic/t2/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/basic/t2/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t2/expected.status.1
diff --git a/usr.bin/make/tests/basic/t2/expected.stderr.1 b/usr.bin/bmake/tests/basic/t2/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/basic/t2/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t2/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t2/expected.stdout.1 b/usr.bin/bmake/tests/basic/t2/expected.stdout.1
index e618540e387d..e618540e387d 100644
--- a/usr.bin/make/tests/basic/t2/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t2/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t2/legacy_test.sh b/usr.bin/bmake/tests/basic/t2/legacy_test.sh
index da4c60a168c5..da4c60a168c5 100644
--- a/usr.bin/make/tests/basic/t2/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t2/legacy_test.sh
diff --git a/usr.bin/make/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile
index ef390dd95c82..a173414588cb 100644
--- a/usr.bin/make/tests/basic/t0/Makefile
+++ b/usr.bin/bmake/tests/basic/t3/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/basic/t3/expected.status.1 b/usr.bin/bmake/tests/basic/t3/expected.status.1
index 0cfbf08886fc..0cfbf08886fc 100644
--- a/usr.bin/make/tests/basic/t3/expected.status.1
+++ b/usr.bin/bmake/tests/basic/t3/expected.status.1
diff --git a/usr.bin/make/tests/basic/t3/expected.stderr.1 b/usr.bin/bmake/tests/basic/t3/expected.stderr.1
index 90280c8298b9..90280c8298b9 100644
--- a/usr.bin/make/tests/basic/t3/expected.stderr.1
+++ b/usr.bin/bmake/tests/basic/t3/expected.stderr.1
diff --git a/usr.bin/make/tests/basic/t3/expected.stdout.1 b/usr.bin/bmake/tests/basic/t3/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/basic/t3/expected.stdout.1
+++ b/usr.bin/bmake/tests/basic/t3/expected.stdout.1
diff --git a/usr.bin/make/tests/basic/t3/legacy_test.sh b/usr.bin/bmake/tests/basic/t3/legacy_test.sh
index 3c41bb373e7d..3c41bb373e7d 100644
--- a/usr.bin/make/tests/basic/t3/legacy_test.sh
+++ b/usr.bin/bmake/tests/basic/t3/legacy_test.sh
diff --git a/usr.bin/make/tests/common.sh b/usr.bin/bmake/tests/common.sh
index 5c5df1e619ed..5c5df1e619ed 100644
--- a/usr.bin/make/tests/common.sh
+++ b/usr.bin/bmake/tests/common.sh
diff --git a/usr.bin/make/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile
index 52ba9b77ba43..2c91bbba23ea 100644
--- a/usr.bin/make/tests/execution/Makefile
+++ b/usr.bin/bmake/tests/execution/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution
 
 TESTS_SUBDIRS=	ellipsis empty joberr plus
 
diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile
index 7f3dc3ecf211..5629b4bb0018 100644
--- a/usr.bin/make/tests/execution/ellipsis/Makefile
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/ellipsis
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/ellipsis/Makefile.test b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test
index d19f64259c52..d19f64259c52 100644
--- a/usr.bin/make/tests/execution/ellipsis/Makefile.test
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test
diff --git a/usr.bin/make/tests/execution/ellipsis/expected.status.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/execution/ellipsis/expected.status.1
+++ b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1
diff --git a/usr.bin/make/tests/execution/ellipsis/expected.stderr.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/execution/ellipsis/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/ellipsis/expected.stdout.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1
index a7e5727b5181..a7e5727b5181 100644
--- a/usr.bin/make/tests/execution/ellipsis/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/ellipsis/legacy_test.sh b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh
index 9e9cd01ff297..9e9cd01ff297 100644
--- a/usr.bin/make/tests/execution/ellipsis/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh
diff --git a/usr.bin/make/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile
index eb7795753453..6421b9620e9e 100644
--- a/usr.bin/make/tests/execution/joberr/Makefile
+++ b/usr.bin/bmake/tests/execution/empty/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/joberr
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/empty/Makefile.test b/usr.bin/bmake/tests/execution/empty/Makefile.test
index f687bce7f245..f687bce7f245 100644
--- a/usr.bin/make/tests/execution/empty/Makefile.test
+++ b/usr.bin/bmake/tests/execution/empty/Makefile.test
diff --git a/usr.bin/make/tests/execution/empty/expected.status.1 b/usr.bin/bmake/tests/execution/empty/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/execution/empty/expected.status.1
+++ b/usr.bin/bmake/tests/execution/empty/expected.status.1
diff --git a/usr.bin/make/tests/execution/empty/expected.stderr.1 b/usr.bin/bmake/tests/execution/empty/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/execution/empty/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/empty/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/empty/expected.stdout.1 b/usr.bin/bmake/tests/execution/empty/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/execution/empty/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/empty/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/empty/legacy_test.sh b/usr.bin/bmake/tests/execution/empty/legacy_test.sh
index e02d175b057d..e02d175b057d 100644
--- a/usr.bin/make/tests/execution/empty/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/empty/legacy_test.sh
diff --git a/usr.bin/make/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile
index 31c27149bfdc..d183eb1347d4 100644
--- a/usr.bin/make/tests/execution/empty/Makefile
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/empty
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/joberr/Makefile.test b/usr.bin/bmake/tests/execution/joberr/Makefile.test
index aca86e87bae8..aca86e87bae8 100644
--- a/usr.bin/make/tests/execution/joberr/Makefile.test
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile.test
diff --git a/usr.bin/make/tests/execution/joberr/expected.status.1 b/usr.bin/bmake/tests/execution/joberr/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/execution/joberr/expected.status.1
+++ b/usr.bin/bmake/tests/execution/joberr/expected.status.1
diff --git a/usr.bin/make/tests/execution/joberr/expected.stderr.1 b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1
index d0c8a2eb27b2..d0c8a2eb27b2 100644
--- a/usr.bin/make/tests/execution/joberr/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/joberr/expected.stdout.1 b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1
index 0ee28f4fd515..0ee28f4fd515 100644
--- a/usr.bin/make/tests/execution/joberr/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/joberr/legacy_test.sh b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh
index 429bfe1d661c..429bfe1d661c 100644
--- a/usr.bin/make/tests/execution/joberr/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh
diff --git a/usr.bin/make/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile
index 2dea97944ba7..8b489d56c6cf 100644
--- a/usr.bin/make/tests/execution/plus/Makefile
+++ b/usr.bin/bmake/tests/execution/plus/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/execution/plus
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/execution/plus/Makefile.test b/usr.bin/bmake/tests/execution/plus/Makefile.test
index ae3bdc30b703..ae3bdc30b703 100644
--- a/usr.bin/make/tests/execution/plus/Makefile.test
+++ b/usr.bin/bmake/tests/execution/plus/Makefile.test
diff --git a/usr.bin/make/tests/execution/plus/expected.status.1 b/usr.bin/bmake/tests/execution/plus/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/execution/plus/expected.status.1
+++ b/usr.bin/bmake/tests/execution/plus/expected.status.1
diff --git a/usr.bin/make/tests/execution/plus/expected.stderr.1 b/usr.bin/bmake/tests/execution/plus/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/execution/plus/expected.stderr.1
+++ b/usr.bin/bmake/tests/execution/plus/expected.stderr.1
diff --git a/usr.bin/make/tests/execution/plus/expected.stdout.1 b/usr.bin/bmake/tests/execution/plus/expected.stdout.1
index b334fc734706..b334fc734706 100644
--- a/usr.bin/make/tests/execution/plus/expected.stdout.1
+++ b/usr.bin/bmake/tests/execution/plus/expected.stdout.1
diff --git a/usr.bin/make/tests/execution/plus/legacy_test.sh b/usr.bin/bmake/tests/execution/plus/legacy_test.sh
index 0737d1bc86b5..0737d1bc86b5 100644
--- a/usr.bin/make/tests/execution/plus/legacy_test.sh
+++ b/usr.bin/bmake/tests/execution/plus/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile
index cde833597529..13b570ea64db 100644
--- a/usr.bin/make/tests/shell/Makefile
+++ b/usr.bin/bmake/tests/shell/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell
 
 TESTS_SUBDIRS=	builtin meta path path_select replace select
 
diff --git a/usr.bin/make/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile
index 3a73215e85bd..cd458a973e50 100644
--- a/usr.bin/make/tests/shell/builtin/Makefile
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/builtin
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/builtin/Makefile.test b/usr.bin/bmake/tests/shell/builtin/Makefile.test
index 03764784e1a0..03764784e1a0 100644
--- a/usr.bin/make/tests/shell/builtin/Makefile.test
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile.test
diff --git a/usr.bin/make/tests/shell/builtin/expected.status.1 b/usr.bin/bmake/tests/shell/builtin/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/builtin/expected.status.1
+++ b/usr.bin/bmake/tests/shell/builtin/expected.status.1
diff --git a/usr.bin/make/tests/shell/builtin/expected.status.2 b/usr.bin/bmake/tests/shell/builtin/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/builtin/expected.status.2
+++ b/usr.bin/bmake/tests/shell/builtin/expected.status.2
diff --git a/usr.bin/make/tests/shell/builtin/expected.stderr.1 b/usr.bin/bmake/tests/shell/builtin/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/builtin/expected.stderr.2 b/usr.bin/bmake/tests/shell/builtin/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/builtin/expected.stdout.1 b/usr.bin/bmake/tests/shell/builtin/expected.stdout.1
index 9c558e357c41..9c558e357c41 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/builtin/expected.stdout.2 b/usr.bin/bmake/tests/shell/builtin/expected.stdout.2
index e350eaf8c7ea..e350eaf8c7ea 100644
--- a/usr.bin/make/tests/shell/builtin/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/builtin/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/builtin/legacy_test.sh b/usr.bin/bmake/tests/shell/builtin/legacy_test.sh
index 6347583faeb6..6347583faeb6 100644
--- a/usr.bin/make/tests/shell/builtin/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/builtin/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/builtin/sh b/usr.bin/bmake/tests/shell/builtin/sh
index 3a507b87f674..3a507b87f674 100644
--- a/usr.bin/make/tests/shell/builtin/sh
+++ b/usr.bin/bmake/tests/shell/builtin/sh
diff --git a/usr.bin/make/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile
index ebd2177cc437..b342e79e3cf3 100644
--- a/usr.bin/make/tests/shell/meta/Makefile
+++ b/usr.bin/bmake/tests/shell/meta/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/meta
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/meta/Makefile.test b/usr.bin/bmake/tests/shell/meta/Makefile.test
index bcf19d052bbc..bcf19d052bbc 100644
--- a/usr.bin/make/tests/shell/meta/Makefile.test
+++ b/usr.bin/bmake/tests/shell/meta/Makefile.test
diff --git a/usr.bin/make/tests/shell/meta/expected.status.1 b/usr.bin/bmake/tests/shell/meta/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/meta/expected.status.1
+++ b/usr.bin/bmake/tests/shell/meta/expected.status.1
diff --git a/usr.bin/make/tests/shell/meta/expected.status.2 b/usr.bin/bmake/tests/shell/meta/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/meta/expected.status.2
+++ b/usr.bin/bmake/tests/shell/meta/expected.status.2
diff --git a/usr.bin/make/tests/shell/meta/expected.stderr.1 b/usr.bin/bmake/tests/shell/meta/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/meta/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/meta/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/meta/expected.stderr.2 b/usr.bin/bmake/tests/shell/meta/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/meta/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/meta/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/meta/expected.stdout.1 b/usr.bin/bmake/tests/shell/meta/expected.stdout.1
index 9c558e357c41..9c558e357c41 100644
--- a/usr.bin/make/tests/shell/meta/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/meta/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/meta/expected.stdout.2 b/usr.bin/bmake/tests/shell/meta/expected.stdout.2
index 6ac6f19502a5..6ac6f19502a5 100644
--- a/usr.bin/make/tests/shell/meta/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/meta/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/meta/legacy_test.sh b/usr.bin/bmake/tests/shell/meta/legacy_test.sh
index 41cd763fd7dd..41cd763fd7dd 100644
--- a/usr.bin/make/tests/shell/meta/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/meta/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/meta/sh b/usr.bin/bmake/tests/shell/meta/sh
index 3a507b87f674..3a507b87f674 100644
--- a/usr.bin/make/tests/shell/meta/sh
+++ b/usr.bin/bmake/tests/shell/meta/sh
diff --git a/usr.bin/make/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile
index d1eb37af2a07..5a83a1ff6adc 100644
--- a/usr.bin/make/tests/shell/path/Makefile
+++ b/usr.bin/bmake/tests/shell/path/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/path/Makefile.test b/usr.bin/bmake/tests/shell/path/Makefile.test
index fe40b645510e..fe40b645510e 100644
--- a/usr.bin/make/tests/shell/path/Makefile.test
+++ b/usr.bin/bmake/tests/shell/path/Makefile.test
diff --git a/usr.bin/make/tests/shell/path/expected.status.1 b/usr.bin/bmake/tests/shell/path/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/path/expected.status.1
+++ b/usr.bin/bmake/tests/shell/path/expected.status.1
diff --git a/usr.bin/make/tests/shell/path/expected.status.2 b/usr.bin/bmake/tests/shell/path/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/path/expected.status.2
+++ b/usr.bin/bmake/tests/shell/path/expected.status.2
diff --git a/usr.bin/make/tests/shell/path/expected.stderr.1 b/usr.bin/bmake/tests/shell/path/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/path/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/path/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/path/expected.stderr.2 b/usr.bin/bmake/tests/shell/path/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/path/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/path/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/path/expected.stdout.1 b/usr.bin/bmake/tests/shell/path/expected.stdout.1
index d881364744b2..d881364744b2 100644
--- a/usr.bin/make/tests/shell/path/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/path/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/path/expected.stdout.2 b/usr.bin/bmake/tests/shell/path/expected.stdout.2
index de3fc89cc9e2..de3fc89cc9e2 100644
--- a/usr.bin/make/tests/shell/path/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/path/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/path/legacy_test.sh b/usr.bin/bmake/tests/shell/path/legacy_test.sh
index 9289a8d2dddd..9289a8d2dddd 100644
--- a/usr.bin/make/tests/shell/path/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/path/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/path/sh b/usr.bin/bmake/tests/shell/path/sh
index 46169eb6efc2..46169eb6efc2 100644
--- a/usr.bin/make/tests/shell/path/sh
+++ b/usr.bin/bmake/tests/shell/path/sh
diff --git a/usr.bin/make/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile
index d9341b4f14bb..1819f910a12a 100644
--- a/usr.bin/make/tests/shell/path_select/Makefile
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/path_select
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/path_select/Makefile.test b/usr.bin/bmake/tests/shell/path_select/Makefile.test
index 05cfb27f3fd9..05cfb27f3fd9 100644
--- a/usr.bin/make/tests/shell/path_select/Makefile.test
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile.test
diff --git a/usr.bin/make/tests/shell/path_select/expected.status.1 b/usr.bin/bmake/tests/shell/path_select/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/path_select/expected.status.1
+++ b/usr.bin/bmake/tests/shell/path_select/expected.status.1
diff --git a/usr.bin/make/tests/shell/path_select/expected.status.2 b/usr.bin/bmake/tests/shell/path_select/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/path_select/expected.status.2
+++ b/usr.bin/bmake/tests/shell/path_select/expected.status.2
diff --git a/usr.bin/make/tests/shell/path_select/expected.stderr.1 b/usr.bin/bmake/tests/shell/path_select/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/path_select/expected.stderr.2 b/usr.bin/bmake/tests/shell/path_select/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/path_select/expected.stdout.1 b/usr.bin/bmake/tests/shell/path_select/expected.stdout.1
index d881364744b2..d881364744b2 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/path_select/expected.stdout.2 b/usr.bin/bmake/tests/shell/path_select/expected.stdout.2
index de3fc89cc9e2..de3fc89cc9e2 100644
--- a/usr.bin/make/tests/shell/path_select/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/path_select/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/path_select/legacy_test.sh b/usr.bin/bmake/tests/shell/path_select/legacy_test.sh
index 6b75b900e438..6b75b900e438 100644
--- a/usr.bin/make/tests/shell/path_select/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/path_select/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/path_select/shell b/usr.bin/bmake/tests/shell/path_select/shell
index 46169eb6efc2..46169eb6efc2 100644
--- a/usr.bin/make/tests/shell/path_select/shell
+++ b/usr.bin/bmake/tests/shell/path_select/shell
diff --git a/usr.bin/make/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile
index 7c64d7213c43..0dae9154bf33 100644
--- a/usr.bin/make/tests/shell/replace/Makefile
+++ b/usr.bin/bmake/tests/shell/replace/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/replace
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/replace/Makefile.test b/usr.bin/bmake/tests/shell/replace/Makefile.test
index 2160dbfb5776..2160dbfb5776 100644
--- a/usr.bin/make/tests/shell/replace/Makefile.test
+++ b/usr.bin/bmake/tests/shell/replace/Makefile.test
diff --git a/usr.bin/make/tests/shell/replace/expected.status.1 b/usr.bin/bmake/tests/shell/replace/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/replace/expected.status.1
+++ b/usr.bin/bmake/tests/shell/replace/expected.status.1
diff --git a/usr.bin/make/tests/shell/replace/expected.status.2 b/usr.bin/bmake/tests/shell/replace/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/replace/expected.status.2
+++ b/usr.bin/bmake/tests/shell/replace/expected.status.2
diff --git a/usr.bin/make/tests/shell/replace/expected.stderr.1 b/usr.bin/bmake/tests/shell/replace/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/replace/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/replace/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/replace/expected.stderr.2 b/usr.bin/bmake/tests/shell/replace/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/replace/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/replace/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/replace/expected.stdout.1 b/usr.bin/bmake/tests/shell/replace/expected.stdout.1
index eff99ea17ab2..eff99ea17ab2 100644
--- a/usr.bin/make/tests/shell/replace/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/replace/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/replace/expected.stdout.2 b/usr.bin/bmake/tests/shell/replace/expected.stdout.2
index c79a09af2916..c79a09af2916 100644
--- a/usr.bin/make/tests/shell/replace/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/replace/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/replace/legacy_test.sh b/usr.bin/bmake/tests/shell/replace/legacy_test.sh
index 880ca780d53b..880ca780d53b 100644
--- a/usr.bin/make/tests/shell/replace/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/replace/legacy_test.sh
diff --git a/usr.bin/make/tests/shell/replace/shell b/usr.bin/bmake/tests/shell/replace/shell
index 46169eb6efc2..46169eb6efc2 100644
--- a/usr.bin/make/tests/shell/replace/shell
+++ b/usr.bin/bmake/tests/shell/replace/shell
diff --git a/usr.bin/make/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile
index 85486c678c0b..45e6d72b6cde 100644
--- a/usr.bin/make/tests/shell/select/Makefile
+++ b/usr.bin/bmake/tests/shell/select/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/shell/select
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/shell/select/Makefile.test b/usr.bin/bmake/tests/shell/select/Makefile.test
index 74d96e1d445b..74d96e1d445b 100644
--- a/usr.bin/make/tests/shell/select/Makefile.test
+++ b/usr.bin/bmake/tests/shell/select/Makefile.test
diff --git a/usr.bin/make/tests/shell/select/expected.status.1 b/usr.bin/bmake/tests/shell/select/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/select/expected.status.1
+++ b/usr.bin/bmake/tests/shell/select/expected.status.1
diff --git a/usr.bin/make/tests/shell/select/expected.status.2 b/usr.bin/bmake/tests/shell/select/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/shell/select/expected.status.2
+++ b/usr.bin/bmake/tests/shell/select/expected.status.2
diff --git a/usr.bin/make/tests/shell/select/expected.stderr.1 b/usr.bin/bmake/tests/shell/select/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/select/expected.stderr.1
+++ b/usr.bin/bmake/tests/shell/select/expected.stderr.1
diff --git a/usr.bin/make/tests/shell/select/expected.stderr.2 b/usr.bin/bmake/tests/shell/select/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/shell/select/expected.stderr.2
+++ b/usr.bin/bmake/tests/shell/select/expected.stderr.2
diff --git a/usr.bin/make/tests/shell/select/expected.stdout.1 b/usr.bin/bmake/tests/shell/select/expected.stdout.1
index c2cdaa0f27c1..c2cdaa0f27c1 100644
--- a/usr.bin/make/tests/shell/select/expected.stdout.1
+++ b/usr.bin/bmake/tests/shell/select/expected.stdout.1
diff --git a/usr.bin/make/tests/shell/select/expected.stdout.2 b/usr.bin/bmake/tests/shell/select/expected.stdout.2
index 5a831e82da12..5a831e82da12 100644
--- a/usr.bin/make/tests/shell/select/expected.stdout.2
+++ b/usr.bin/bmake/tests/shell/select/expected.stdout.2
diff --git a/usr.bin/make/tests/shell/select/legacy_test.sh b/usr.bin/bmake/tests/shell/select/legacy_test.sh
index 46d3eafe571b..46d3eafe571b 100644
--- a/usr.bin/make/tests/shell/select/legacy_test.sh
+++ b/usr.bin/bmake/tests/shell/select/legacy_test.sh
diff --git a/usr.bin/make/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile
index f15620d32d0f..60ec86e7e5ee 100644
--- a/usr.bin/make/tests/suffixes/Makefile
+++ b/usr.bin/bmake/tests/suffixes/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes
 
 TESTS_SUBDIRS=	basic src_wild1 src_wild2
 
diff --git a/usr.bin/make/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile
index 2bd3a788e7c5..9ae720ee8275 100644
--- a/usr.bin/make/tests/suffixes/basic/Makefile
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/basic
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/suffixes/basic/Makefile.test b/usr.bin/bmake/tests/suffixes/basic/Makefile.test
index 45d9130eed97..45d9130eed97 100644
--- a/usr.bin/make/tests/suffixes/basic/Makefile.test
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile.test
diff --git a/usr.bin/make/tests/suffixes/basic/TEST1.a b/usr.bin/bmake/tests/suffixes/basic/TEST1.a
index da5569b525e3..da5569b525e3 100644
--- a/usr.bin/make/tests/suffixes/basic/TEST1.a
+++ b/usr.bin/bmake/tests/suffixes/basic/TEST1.a
diff --git a/usr.bin/make/tests/suffixes/basic/expected.status.1 b/usr.bin/bmake/tests/suffixes/basic/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/suffixes/basic/expected.status.1
+++ b/usr.bin/bmake/tests/suffixes/basic/expected.status.1
diff --git a/usr.bin/make/tests/suffixes/basic/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/basic/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/suffixes/basic/expected.stderr.1
+++ b/usr.bin/bmake/tests/suffixes/basic/expected.stderr.1
diff --git a/usr.bin/make/tests/suffixes/basic/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/basic/expected.stdout.1
index 582927e8e98e..582927e8e98e 100644
--- a/usr.bin/make/tests/suffixes/basic/expected.stdout.1
+++ b/usr.bin/bmake/tests/suffixes/basic/expected.stdout.1
diff --git a/usr.bin/make/tests/suffixes/basic/legacy_test.sh b/usr.bin/bmake/tests/suffixes/basic/legacy_test.sh
index 3446bf0f7ab1..3446bf0f7ab1 100644
--- a/usr.bin/make/tests/suffixes/basic/legacy_test.sh
+++ b/usr.bin/bmake/tests/suffixes/basic/legacy_test.sh
diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
index e10e8e893eb1..00be930047c1 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/suffixes/src_wild1/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test
index d0258ad126c6..d0258ad126c6 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/Makefile.test
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test
diff --git a/usr.bin/make/tests/suffixes/src_wild1/TEST1.a b/usr.bin/bmake/tests/suffixes/src_wild1/TEST1.a
index da5569b525e3..da5569b525e3 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/TEST1.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/TEST1.a
diff --git a/usr.bin/make/tests/suffixes/src_wild1/TEST2.a b/usr.bin/bmake/tests/suffixes/src_wild1/TEST2.a
index 34f850858dc0..34f850858dc0 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/TEST2.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/TEST2.a
diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.status.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/expected.status.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/expected.status.1
diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/expected.stderr.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stderr.1
diff --git a/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stdout.1
index 3cd2129260c1..3cd2129260c1 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/expected.stdout.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/expected.stdout.1
diff --git a/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh b/usr.bin/bmake/tests/suffixes/src_wild1/legacy_test.sh
index 053cc6cddd16..053cc6cddd16 100644
--- a/usr.bin/make/tests/suffixes/src_wild1/legacy_test.sh
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/legacy_test.sh
diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
index a474baeaa8ed..34aad07fcdc1 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/suffixes/src_wild2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/suffixes/src_wild2/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile.test
index 1dea7ea967ec..1dea7ea967ec 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/Makefile.test
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile.test
diff --git a/usr.bin/make/tests/suffixes/src_wild2/TEST1.a b/usr.bin/bmake/tests/suffixes/src_wild2/TEST1.a
index da5569b525e3..da5569b525e3 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/TEST1.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/TEST1.a
diff --git a/usr.bin/make/tests/suffixes/src_wild2/TEST2.a b/usr.bin/bmake/tests/suffixes/src_wild2/TEST2.a
index 34f850858dc0..34f850858dc0 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/TEST2.a
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/TEST2.a
diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.status.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/expected.status.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/expected.status.1
diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/expected.stderr.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stderr.1
diff --git a/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1 b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stdout.1
index 3cd2129260c1..3cd2129260c1 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/expected.stdout.1
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/expected.stdout.1
diff --git a/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh b/usr.bin/bmake/tests/suffixes/src_wild2/legacy_test.sh
index 03cff9382afa..03cff9382afa 100644
--- a/usr.bin/make/tests/suffixes/src_wild2/legacy_test.sh
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile
index 80f18465c9b3..3cd89f84428f 100644
--- a/usr.bin/make/tests/syntax/Makefile
+++ b/usr.bin/bmake/tests/syntax/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax
 
 TESTS_SUBDIRS=	directive-t0 enl funny-targets semi
 
diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
new file mode 100644
index 000000000000..66e1f3253a02
--- /dev/null
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile.test b/usr.bin/bmake/tests/syntax/directive-t0/Makefile.test
index 0f95a2161164..0f95a2161164 100644
--- a/usr.bin/make/tests/syntax/directive-t0/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile.test
diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.status.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.status.1
index d00491fd7e5b..d00491fd7e5b 100644
--- a/usr.bin/make/tests/syntax/directive-t0/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/directive-t0/expected.status.1
diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.stderr.1
index de66fcc37752..de66fcc37752 100644
--- a/usr.bin/make/tests/syntax/directive-t0/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/directive-t0/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1 b/usr.bin/bmake/tests/syntax/directive-t0/expected.stdout.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/directive-t0/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/directive-t0/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh b/usr.bin/bmake/tests/syntax/directive-t0/legacy_test.sh
index 451c8764c252..451c8764c252 100644
--- a/usr.bin/make/tests/syntax/directive-t0/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/directive-t0/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile
index 362962c44c09..743e88fb49fc 100644
--- a/usr.bin/make/tests/syntax/enl/Makefile
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/enl
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/syntax/enl/Makefile.test b/usr.bin/bmake/tests/syntax/enl/Makefile.test
index a7c69555f244..a7c69555f244 100644
--- a/usr.bin/make/tests/syntax/enl/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile.test
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.1 b/usr.bin/bmake/tests/syntax/enl/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.1
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.2 b/usr.bin/bmake/tests/syntax/enl/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.2
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.2
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.3 b/usr.bin/bmake/tests/syntax/enl/expected.status.3
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.3
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.3
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.4 b/usr.bin/bmake/tests/syntax/enl/expected.status.4
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.4
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.4
diff --git a/usr.bin/make/tests/syntax/enl/expected.status.5 b/usr.bin/bmake/tests/syntax/enl/expected.status.5
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/enl/expected.status.5
+++ b/usr.bin/bmake/tests/syntax/enl/expected.status.5
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.1 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.2 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.2
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.2
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.3 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.3
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.3
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.4 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.4
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.4
diff --git a/usr.bin/make/tests/syntax/enl/expected.stderr.5 b/usr.bin/bmake/tests/syntax/enl/expected.stderr.5
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stderr.5
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stderr.5
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.1 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.1
index 9766475a4185..9766475a4185 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.2 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.2
index 9766475a4185..9766475a4185 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.2
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.2
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.3 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.3
index 422c2b7ab3b3..422c2b7ab3b3 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.3
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.3
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.4 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.4
index b2901ea97cfc..b2901ea97cfc 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.4
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.4
diff --git a/usr.bin/make/tests/syntax/enl/expected.stdout.5 b/usr.bin/bmake/tests/syntax/enl/expected.stdout.5
index 51200767c616..51200767c616 100644
--- a/usr.bin/make/tests/syntax/enl/expected.stdout.5
+++ b/usr.bin/bmake/tests/syntax/enl/expected.stdout.5
diff --git a/usr.bin/make/tests/syntax/enl/legacy_test.sh b/usr.bin/bmake/tests/syntax/enl/legacy_test.sh
index 307c1f02d2f0..307c1f02d2f0 100644
--- a/usr.bin/make/tests/syntax/enl/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/enl/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
index 07b1f754417e..53a3e4d762db 100644
--- a/usr.bin/make/tests/syntax/funny-targets/Makefile
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/funny-targets
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/syntax/funny-targets/Makefile.test b/usr.bin/bmake/tests/syntax/funny-targets/Makefile.test
index 064ab3a9435f..064ab3a9435f 100644
--- a/usr.bin/make/tests/syntax/funny-targets/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile.test
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.status.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.1
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.status.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.status.2
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.status.2
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stderr.2
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stderr.2
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.1
index 09cb2328e9f7..09cb2328e9f7 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2 b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.2
index b2f03648b48d..b2f03648b48d 100644
--- a/usr.bin/make/tests/syntax/funny-targets/expected.stdout.2
+++ b/usr.bin/bmake/tests/syntax/funny-targets/expected.stdout.2
diff --git a/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh b/usr.bin/bmake/tests/syntax/funny-targets/legacy_test.sh
index e9cd31701ecd..e9cd31701ecd 100644
--- a/usr.bin/make/tests/syntax/funny-targets/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/funny-targets/legacy_test.sh
diff --git a/usr.bin/make/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile
index 703683d1ca9d..00a7f1e94e34 100644
--- a/usr.bin/make/tests/syntax/semi/Makefile
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/semi
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/syntax/semi/Makefile.test b/usr.bin/bmake/tests/syntax/semi/Makefile.test
index 12f52255ee12..12f52255ee12 100644
--- a/usr.bin/make/tests/syntax/semi/Makefile.test
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile.test
diff --git a/usr.bin/make/tests/syntax/semi/expected.status.1 b/usr.bin/bmake/tests/syntax/semi/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/semi/expected.status.1
+++ b/usr.bin/bmake/tests/syntax/semi/expected.status.1
diff --git a/usr.bin/make/tests/syntax/semi/expected.status.2 b/usr.bin/bmake/tests/syntax/semi/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/syntax/semi/expected.status.2
+++ b/usr.bin/bmake/tests/syntax/semi/expected.status.2
diff --git a/usr.bin/make/tests/syntax/semi/expected.stderr.1 b/usr.bin/bmake/tests/syntax/semi/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stderr.1
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stderr.1
diff --git a/usr.bin/make/tests/syntax/semi/expected.stderr.2 b/usr.bin/bmake/tests/syntax/semi/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stderr.2
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stderr.2
diff --git a/usr.bin/make/tests/syntax/semi/expected.stdout.1 b/usr.bin/bmake/tests/syntax/semi/expected.stdout.1
index 12b9617511d6..12b9617511d6 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stdout.1
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stdout.1
diff --git a/usr.bin/make/tests/syntax/semi/expected.stdout.2 b/usr.bin/bmake/tests/syntax/semi/expected.stdout.2
index be0fa5556666..be0fa5556666 100644
--- a/usr.bin/make/tests/syntax/semi/expected.stdout.2
+++ b/usr.bin/bmake/tests/syntax/semi/expected.stdout.2
diff --git a/usr.bin/make/tests/syntax/semi/legacy_test.sh b/usr.bin/bmake/tests/syntax/semi/legacy_test.sh
index 092635a84957..092635a84957 100644
--- a/usr.bin/make/tests/syntax/semi/legacy_test.sh
+++ b/usr.bin/bmake/tests/syntax/semi/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile
index 7b7b9819b867..90d90f1ddbd4 100644
--- a/usr.bin/make/tests/sysmk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk
 
 TESTS_SUBDIRS=	t0 t1 t2
 
diff --git a/usr.bin/make/tests/variables/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
index 06e117972c25..5578a9b90d23 100644
--- a/usr.bin/make/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile.test
index fc95f46e679e..fc95f46e679e 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/Makefile.test
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile.test
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/expected.status.1
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.status.1
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/expected.stderr.1
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stderr.1
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stdout.1
index 6f29307aecc3..6f29307aecc3 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/expected.stdout.1
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/expected.stdout.1
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t0/2/1/legacy_test.sh
index 0214842f48e4..0214842f48e4 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/legacy_test.sh
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
index 3dd84f0d05aa..22048078844b 100644
--- a/usr.bin/make/tests/sysmk/t2/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1
 
diff --git a/usr.bin/make/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile
index d8a2c06bc5d7..f38383c4e893 100644
--- a/usr.bin/make/tests/sysmk/t1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk
diff --git a/usr.bin/make/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
index 047b9de35559..be1bd5a2ff46 100644
--- a/usr.bin/make/tests/sysmk/t0/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test
index 60f195533ed2..60f195533ed2 100644
--- a/usr.bin/make/tests/sysmk/t0/mk/sys.mk.test
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
index aa937668c56c..c5e2889fadd6 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup
index c3d58b79e422..c3d58b79e422 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/cleanup
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/cleanup
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/expected.status.1
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.status.1
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/expected.stderr.1
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stderr.1
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stdout.1
index 6f29307aecc3..6f29307aecc3 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/expected.stdout.1
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/expected.stdout.1
diff --git a/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t1/2/1/legacy_test.sh
index fb738516283c..fb738516283c 100644
--- a/usr.bin/make/tests/sysmk/t1/2/1/legacy_test.sh
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
index ecd79b3692ca..7c2e61927ecf 100644
--- a/usr.bin/make/tests/sysmk/t0/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1
 
diff --git a/usr.bin/make/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile
index 3f95a852d237..4d3282345516 100644
--- a/usr.bin/make/tests/sysmk/t2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk
diff --git a/usr.bin/make/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
index da052af94744..ccfd1b6b6724 100644
--- a/usr.bin/make/tests/sysmk/t1/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test
index 99b8ecc1d389..99b8ecc1d389 100644
--- a/usr.bin/make/tests/sysmk/t1/mk/sys.mk.test
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
index 52fdd8d7ed89..e06539a8780e 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/cleanup b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup
index c3d58b79e422..c3d58b79e422 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/cleanup
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/cleanup
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/expected.status.1
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.status.1
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/expected.stderr.1
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stderr.1
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1 b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stdout.1
index 70f1be3c507c..70f1be3c507c 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/expected.stdout.1
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/expected.stdout.1
diff --git a/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh b/usr.bin/bmake/tests/sysmk/t2/2/1/legacy_test.sh
index ca817d8098d0..ca817d8098d0 100644
--- a/usr.bin/make/tests/sysmk/t2/2/1/legacy_test.sh
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
index 3e5d82cbf188..7d1c68e637bd 100644
--- a/usr.bin/make/tests/sysmk/t1/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t1/2
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1
 
diff --git a/usr.bin/make/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile
index 277792575c48..734c7d8802a0 100644
--- a/usr.bin/make/tests/sysmk/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2
 SUBDIR=		mk
diff --git a/usr.bin/make/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
index 5fdb1ac83977..29460dc18965 100644
--- a/usr.bin/make/tests/sysmk/t2/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t2/mk
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
 FILESDIR=		${TESTSDIR}
 FILES=			sys.mk.test
diff --git a/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test
index 55632fdc90a4..55632fdc90a4 100644
--- a/usr.bin/make/tests/sysmk/t2/mk/sys.mk.test
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/sys.mk.test
diff --git a/usr.bin/make/tests/test-new.mk b/usr.bin/bmake/tests/test-new.mk
index f200833f81f1..f200833f81f1 100644
--- a/usr.bin/make/tests/test-new.mk
+++ b/usr.bin/bmake/tests/test-new.mk
diff --git a/usr.bin/make/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile
index 9f328a8370da..e010718e65a4 100644
--- a/usr.bin/make/tests/variables/Makefile
+++ b/usr.bin/bmake/tests/variables/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables
 
 TESTS_SUBDIRS=	modifier_M modifier_t opt_V t0
 
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
new file mode 100644
index 000000000000..2490382f8aef
--- /dev/null
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile.test b/usr.bin/bmake/tests/variables/modifier_M/Makefile.test
index 34d4cd44a95b..34d4cd44a95b 100644
--- a/usr.bin/make/tests/variables/modifier_M/Makefile.test
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile.test
diff --git a/usr.bin/make/tests/variables/modifier_M/expected.status.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/modifier_M/expected.status.1
+++ b/usr.bin/bmake/tests/variables/modifier_M/expected.status.1
diff --git a/usr.bin/make/tests/variables/modifier_M/expected.stderr.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/modifier_M/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/modifier_M/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/modifier_M/expected.stdout.1 b/usr.bin/bmake/tests/variables/modifier_M/expected.stdout.1
index b29e6df10233..b29e6df10233 100644
--- a/usr.bin/make/tests/variables/modifier_M/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/modifier_M/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/modifier_M/legacy_test.sh b/usr.bin/bmake/tests/variables/modifier_M/legacy_test.sh
index 6a3e68ff575d..6a3e68ff575d 100644
--- a/usr.bin/make/tests/variables/modifier_M/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/modifier_M/legacy_test.sh
diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index 4b5bfee0ddcb..d108da43edfc 100644
--- a/usr.bin/make/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_t
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/variables/modifier_t/Makefile.test b/usr.bin/bmake/tests/variables/modifier_t/Makefile.test
index 53844eecf573..53844eecf573 100644
--- a/usr.bin/make/tests/variables/modifier_t/Makefile.test
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile.test
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.status.1
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.status.1
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.status.2
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.status.2
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.status.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.status.3
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.status.3
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.status.3
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stderr.2
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.2
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stderr.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stderr.3
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stderr.3
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.1 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.1
index dff38fdd07ff..dff38fdd07ff 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.2 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.2
index 71a0f6077ef2..71a0f6077ef2 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stdout.2
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.2
diff --git a/usr.bin/make/tests/variables/modifier_t/expected.stdout.3 b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.3
index 6434c7ba7434..6434c7ba7434 100644
--- a/usr.bin/make/tests/variables/modifier_t/expected.stdout.3
+++ b/usr.bin/bmake/tests/variables/modifier_t/expected.stdout.3
diff --git a/usr.bin/make/tests/variables/modifier_t/legacy_test.sh b/usr.bin/bmake/tests/variables/modifier_t/legacy_test.sh
index 7f145718b6d2..7f145718b6d2 100644
--- a/usr.bin/make/tests/variables/modifier_t/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/modifier_t/legacy_test.sh
diff --git a/usr.bin/make/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index 0c3bf1779e4f..94a6affd53fc 100644
--- a/usr.bin/make/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/opt_V
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/variables/opt_V/Makefile.test b/usr.bin/bmake/tests/variables/opt_V/Makefile.test
index 128e5118bc41..128e5118bc41 100644
--- a/usr.bin/make/tests/variables/opt_V/Makefile.test
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile.test
diff --git a/usr.bin/make/tests/variables/opt_V/expected.status.1 b/usr.bin/bmake/tests/variables/opt_V/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.status.1
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.status.1
diff --git a/usr.bin/make/tests/variables/opt_V/expected.status.2 b/usr.bin/bmake/tests/variables/opt_V/expected.status.2
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.status.2
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.status.2
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stderr.1 b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stderr.2 b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stderr.2
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stderr.2
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stdout.1 b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.1
index 050db40eed2b..050db40eed2b 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/opt_V/expected.stdout.2 b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.2
index 4da2aeffad3e..4da2aeffad3e 100644
--- a/usr.bin/make/tests/variables/opt_V/expected.stdout.2
+++ b/usr.bin/bmake/tests/variables/opt_V/expected.stdout.2
diff --git a/usr.bin/make/tests/variables/opt_V/legacy_test.sh b/usr.bin/bmake/tests/variables/opt_V/legacy_test.sh
index 4b1122acac83..4b1122acac83 100644
--- a/usr.bin/make/tests/variables/opt_V/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/opt_V/legacy_test.sh
diff --git a/usr.bin/make/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index 2c732f5ba180..c4b98e653ccd 100644
--- a/usr.bin/make/tests/sysmk/t0/2/1/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/make/sysmk/t0/2/1
+TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test
 
diff --git a/usr.bin/make/tests/variables/t0/Makefile.test b/usr.bin/bmake/tests/variables/t0/Makefile.test
index 1cc58eefa493..1cc58eefa493 100644
--- a/usr.bin/make/tests/variables/t0/Makefile.test
+++ b/usr.bin/bmake/tests/variables/t0/Makefile.test
diff --git a/usr.bin/make/tests/variables/t0/expected.status.1 b/usr.bin/bmake/tests/variables/t0/expected.status.1
index 573541ac9702..573541ac9702 100644
--- a/usr.bin/make/tests/variables/t0/expected.status.1
+++ b/usr.bin/bmake/tests/variables/t0/expected.status.1
diff --git a/usr.bin/make/tests/variables/t0/expected.stderr.1 b/usr.bin/bmake/tests/variables/t0/expected.stderr.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/usr.bin/make/tests/variables/t0/expected.stderr.1
+++ b/usr.bin/bmake/tests/variables/t0/expected.stderr.1
diff --git a/usr.bin/make/tests/variables/t0/expected.stdout.1 b/usr.bin/bmake/tests/variables/t0/expected.stdout.1
index e2c70dedf68f..e2c70dedf68f 100644
--- a/usr.bin/make/tests/variables/t0/expected.stdout.1
+++ b/usr.bin/bmake/tests/variables/t0/expected.stdout.1
diff --git a/usr.bin/make/tests/variables/t0/legacy_test.sh b/usr.bin/bmake/tests/variables/t0/legacy_test.sh
index 8c78e2d08259..8c78e2d08259 100644
--- a/usr.bin/make/tests/variables/t0/legacy_test.sh
+++ b/usr.bin/bmake/tests/variables/t0/legacy_test.sh
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index bd9d58dd3538..dbc545f0f61b 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -116,8 +116,4 @@ PROG=	fmake
 fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/make/tests/syntax/directive-t0/Makefile b/usr.bin/make/tests/syntax/directive-t0/Makefile
deleted file mode 100644
index 6d557e2a2443..000000000000
--- a/usr.bin/make/tests/syntax/directive-t0/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-TESTSDIR=	${TESTSBASE}/usr.bin/make/syntax/directive-t0
-
-TAP_TESTS_SH=	legacy_test
-
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
-
-.include <bsd.test.mk>
diff --git a/usr.bin/make/tests/variables/modifier_M/Makefile b/usr.bin/make/tests/variables/modifier_M/Makefile
deleted file mode 100644
index 59cb0bc1d352..000000000000
--- a/usr.bin/make/tests/variables/modifier_M/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-TESTSDIR=	${TESTSBASE}/usr.bin/make/variables/modifier_M
-
-TAP_TESTS_SH=	legacy_test
-
-FILESDIR=	${TESTSDIR}
-FILES=		Makefile.test
-FILES+=		expected.status.1
-FILES+=		expected.stderr.1
-FILES+=		expected.stdout.1
-
-.include <bsd.test.mk>