6 files changed, 1 insertions, 29 deletions
diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile
index bdec4c4..e06928c 100644
--- a/sbin/devd/tests/Makefile
+++ b/sbin/devd/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 ATF_TESTS_C=	client_test
 TEST_METADATA.client_test=	required_programs="devd"
 TEST_METADATA.client_test+=	required_user="root"
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
index 88516d9..2852aaf 100644
--- a/sbin/dhclient/tests/Makefile
+++ b/sbin/dhclient/tests/Makefile
@@ -1,10 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
-.PATH:	${.CURDIR}/..
+.PATH:	${.CURDIR:H}
 
 PLAIN_TESTS_C=				option-domain-search_test
 SRCS.option-domain-search_test=		alloc.c convert.c hash.c options.c \
diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile
index 5fdceb7..6a3208d 100644
--- a/sbin/growfs/tests/Makefile
+++ b/sbin/growfs/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>
diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile
index 8a55191..93967c7 100644
--- a/sbin/ifconfig/tests/Makefile
+++ b/sbin/ifconfig/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 NETBSD_ATF_TESTS_SH=		nonexistent_test
 
 .include <netbsd-tests.test.mk>
diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile
index 58507d3..6c179fc 100644
--- a/sbin/mdconfig/tests/Makefile
+++ b/sbin/mdconfig/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 ATF_TESTS_SH=	mdconfig_test
 
 TEST_METADATA.mdconfig_test+=	required_user="root"
diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile
index 06058a0..3b3078f 100644
--- a/sbin/tests/Makefile
+++ b/sbin/tests/Makefile
@@ -1,13 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-FILESGROUPS=	FILES
-PACKAGE=	tests
-FILESGROUPS+=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TESTS+=		Kyuafile
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes