diff --git a/etc/Makefile b/etc/Makefile
index e8295b72e53..e5195f67b7d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -10,10 +10,6 @@ SUBDIR=	\
 SUBDIR+=sendmail
 .endif
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
-
 BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index f1f6afe52b0..1e6e28ffbaa 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -263,10 +263,6 @@ FILES+=		routed
 FILES+=		sendmail
 .endif
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
 .if ${MK_TIMED} != "no"
 FILES+=		timed
 .endif
diff --git a/tests/Makefile b/tests/Makefile
index 89da82d2adf..12c150973b6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+SUBDIR= etc
 SUBDIR= sys
 
 TESTSDIR= ${TESTSBASE}
diff --git a/etc/tests/Makefile b/tests/etc/Makefile
similarity index 73%
rename from etc/tests/Makefile
rename to tests/etc/Makefile
index 5aacd5b19e5..9aad25c0639 100644
--- a/etc/tests/Makefile
+++ b/tests/etc/Makefile
@@ -4,7 +4,9 @@
 
 TESTSDIR=	${TESTSBASE}/etc
 
-.PATH:		${.CURDIR:H:H}/tests
+.PATH:		${.CURDIR:H}
 KYUAFILE=	yes
 
+SUBDIR+=	rc.d
+
 .include <bsd.test.mk>
diff --git a/etc/rc.d/tests/Makefile b/tests/etc/rc.d/Makefile
similarity index 100%
rename from etc/rc.d/tests/Makefile
rename to tests/etc/rc.d/Makefile
diff --git a/etc/rc.d/tests/routing_test.sh b/tests/etc/rc.d/routing_test.sh
similarity index 100%
rename from etc/rc.d/tests/routing_test.sh
rename to tests/etc/rc.d/routing_test.sh