7 files changed, 2 insertions, 16 deletions
diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile
index da83397..45b12b7 100644
--- a/usr.sbin/etcupdate/tests/Makefile
+++ b/usr.sbin/etcupdate/tests/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.sbin/etcupdate
-
 PLAIN_TESTS_SH=
 .for test in	always_test \
 		conflicts_test \
diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile
index db686b59..01c9869 100644
--- a/usr.sbin/fstyp/tests/Makefile
+++ b/usr.sbin/fstyp/tests/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.sbin/fstyp
-
 ATF_TESTS_SH=	fstyp_test
 
 FILES=	ext2.img.bz2
diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile
index f8ad273..802a44c 100644
--- a/usr.sbin/newsyslog/tests/Makefile
+++ b/usr.sbin/newsyslog/tests/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.sbin/newsyslog
-
 TAP_TESTS_SH=	legacy_test
 
 .include <bsd.test.mk>
diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile
index 1df81d0..0b63127 100644
--- a/usr.sbin/nmtree/tests/Makefile
+++ b/usr.sbin/nmtree/tests/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/mtree
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree
 .PATH: ${TESTSRC}
 
-TESTSDIR=	${TESTSBASE}/usr.sbin/nmtree
-
 ATF_TESTS_SH=	nmtree_test
 ATF_TESTS_SH_SRC_nmtree_test=	t_mtree.sh
 
diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile
index a1605aa..27f0ac4 100644
--- a/usr.sbin/pw/tests/Makefile
+++ b/usr.sbin/pw/tests/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.sbin/pw
-
 ATF_TESTS_SH=	pw_etcdir \
 		pw_lock \
 		pw_config \
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
index 204b510..3c74ba9 100644
--- a/usr.sbin/sa/tests/Makefile
+++ b/usr.sbin/sa/tests/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.sbin/sa
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}
diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile
index a7e9c71..a0e63e5 100644
--- a/usr.sbin/tests/Makefile
+++ b/usr.sbin/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.sbin
-
-.PATH:		${.CURDIR:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>