40 files changed, 120 insertions, 0 deletions

diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
index 15389c802772..5ef093f61708 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
index 1d2f6e272cdc..0b9db19071fd 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
index 2a96124193ca..b76bdc19164e 100644
--- a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile
index 12356596e374..d1ee84d9a5b3 100644
--- a/usr.bin/bmake/tests/basic/t0/Makefile
+++ b/usr.bin/bmake/tests/basic/t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile
index 732dc65d91af..3faeffab7764 100644
--- a/usr.bin/bmake/tests/basic/t1/Makefile
+++ b/usr.bin/bmake/tests/basic/t1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile
index 58c36ff96f8d..6d7b6b494c43 100644
--- a/usr.bin/bmake/tests/basic/t2/Makefile
+++ b/usr.bin/bmake/tests/basic/t2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile
index a173414588cb..2b268e92f506 100644
--- a/usr.bin/bmake/tests/basic/t3/Makefile
+++ b/usr.bin/bmake/tests/basic/t3/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile
index 5629b4bb0018..abc8b9e496e9 100644
--- a/usr.bin/bmake/tests/execution/ellipsis/Makefile
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile
index 6421b9620e9e..282814036f20 100644
--- a/usr.bin/bmake/tests/execution/empty/Makefile
+++ b/usr.bin/bmake/tests/execution/empty/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile
index d183eb1347d4..7056afdb1653 100644
--- a/usr.bin/bmake/tests/execution/joberr/Makefile
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile
index 8b489d56c6cf..c5e42bd385a4 100644
--- a/usr.bin/bmake/tests/execution/plus/Makefile
+++ b/usr.bin/bmake/tests/execution/plus/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile
index cd458a973e50..713e8256315d 100644
--- a/usr.bin/bmake/tests/shell/builtin/Makefile
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile
index b342e79e3cf3..4b14289a9b1b 100644
--- a/usr.bin/bmake/tests/shell/meta/Makefile
+++ b/usr.bin/bmake/tests/shell/meta/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile
index 5a83a1ff6adc..8b1ce86794b2 100644
--- a/usr.bin/bmake/tests/shell/path/Makefile
+++ b/usr.bin/bmake/tests/shell/path/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile
index 1819f910a12a..acc63395abc5 100644
--- a/usr.bin/bmake/tests/shell/path_select/Makefile
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile
index 0dae9154bf33..b0f21ab5e747 100644
--- a/usr.bin/bmake/tests/shell/replace/Makefile
+++ b/usr.bin/bmake/tests/shell/replace/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile
index 45e6d72b6cde..e62701000031 100644
--- a/usr.bin/bmake/tests/shell/select/Makefile
+++ b/usr.bin/bmake/tests/shell/select/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile
index 9ae720ee8275..d917de0c0f21 100644
--- a/usr.bin/bmake/tests/suffixes/basic/Makefile
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
index 00be930047c1..621ec60ce75d 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
index 34aad07fcdc1..a1c65351933b 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
index 66e1f3253a02..e790b942f6d2 100644
--- a/usr.bin/bmake/tests/syntax/directive-t0/Makefile
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile
index 743e88fb49fc..0ba16a788c12 100644
--- a/usr.bin/bmake/tests/syntax/enl/Makefile
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
index 53a3e4d762db..3e56b2b76a8e 100644
--- a/usr.bin/bmake/tests/syntax/funny-targets/Makefile
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile
index 00a7f1e94e34..cb57bbc71efe 100644
--- a/usr.bin/bmake/tests/syntax/semi/Makefile
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
index 5578a9b90d23..87e6827d57fd 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
index 22048078844b..2a6fc75df7e8 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile
index f38383c4e893..d31d5619f65e 100644
--- a/usr.bin/bmake/tests/sysmk/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
index be1bd5a2ff46..e7620a5afce3 100644
--- a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
 FILESDIR=		${TESTSDIR}
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
index c5e2889fadd6..a66fb25cb87e 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
index 7c2e61927ecf..bf3991a63bf3 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile
index 4d3282345516..fac186f0d8a3 100644
--- a/usr.bin/bmake/tests/sysmk/t1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
index ccfd1b6b6724..dc46dd8b3e74 100644
--- a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
 FILESDIR=		${TESTSDIR}
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
index e06539a8780e..5ce319487925 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
index 7d1c68e637bd..9b0526ff333d 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile
index 734c7d8802a0..1c6bad0b9779 100644
--- a/usr.bin/bmake/tests/sysmk/t2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
index 29460dc18965..7aec6561e77a 100644
--- a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
 FILESDIR=		${TESTSDIR}
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
index 2490382f8aef..5841047477e5 100644
--- a/usr.bin/bmake/tests/variables/modifier_M/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index d108da43edfc..b35881a4afb6 100644
--- a/usr.bin/bmake/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index 94a6affd53fc..f52507f202f4 100644
--- a/usr.bin/bmake/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index c4b98e653ccd..4b845d71db75 100644
--- a/usr.bin/bmake/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test