diff --git a/tests/sys/arch/Makefile b/tests/sys/arch/Makefile
index e1a35422410..40edad27507 100644
--- a/tests/sys/arch/Makefile
+++ b/tests/sys/arch/Makefile
@@ -1,5 +1,7 @@
+TESTSDIR=	${TESTSBASE}/sys/arch
+
 .if exists(${.CURDIR}/${MACHINE_ARCH})
-SUBDIR+=	${MACHINE_ARCH}
+TESTS_SUBDIRS+=	${MACHINE_ARCH}
 .endif
 
-.include <bsd.subdir.mk>
+.include <bsd.test.mk>
diff --git a/tests/sys/arch/Makefile.inc b/tests/sys/arch/Makefile.inc
index cf5c687d640..01b5f23410c 100644
--- a/tests/sys/arch/Makefile.inc
+++ b/tests/sys/arch/Makefile.inc
@@ -1,3 +1 @@
-TESTSDIR=		${TESTSBASE}/sys/arch
-
 .include "../Makefile.inc"