diff --git a/Makefile.inc1 b/Makefile.inc1
index a592034cf97b..a04acb35fcbe 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -509,7 +509,7 @@ _worldtmp:
 .endif
 .if ${MK_TESTS} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
+	    -p ${WORLDTMP}/usr >/dev/null
 .endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
diff --git a/etc/Makefile b/etc/Makefile
index d763df6d44e9..70a1e2a39508 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -321,7 +321,7 @@ MTREES+=	mtree/BSD.debug.dist		/usr/lib
 MTREES+=	mtree/BSD.groff.dist		/usr
 .endif
 .if ${MK_TESTS} != "no"
-MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
+MTREES+=	mtree/BSD.tests.dist		/usr
 .endif
 .if ${MK_SENDMAIL} != "no"
 MTREES+=	mtree/BSD.sendmail.dist		/
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 667d576523dc..6641b5e7a552 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -9,10 +9,6 @@
     ..
     arpa
     ..
-    atf-c
-    ..
-    atf-c++
-    ..
     bsm
     ..
     bsnmp
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index d56811bea51a..85a0811a0914 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -5,27 +5,43 @@
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-    lib
-        atf
-            libatf-c
-            ..
-            libatf-c++
-            ..
-            test-programs
-            ..
+    include
+        atf-c
         ..
-        libcrypt
+        atf-c++
         ..
     ..
-    libexec
+    share
         atf
-            atf-check
+        ..
+        doc
+            atf
             ..
         ..
     ..
-    usr.bin
-        atf
-            atf-sh
+    tests
+        lib
+            atf
+                libatf-c
+                ..
+                libatf-c++
+                ..
+                test-programs
+                ..
+            ..
+            libcrypt
+            ..
+        ..
+        libexec
+            atf
+                atf-check
+                ..
+            ..
+        ..
+        usr.bin
+            atf
+                atf-sh
+                ..
             ..
         ..
     ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index f6c0306500e6..d70ca48ef0f0 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -120,8 +120,6 @@
     sbin
     ..
     share
-        atf
-        ..
         bsdconfig
             media
             ..
@@ -165,8 +163,6 @@
         doc
             IPv6
             ..
-            atf
-            ..
             atm
             ..
             legal
@@ -1443,6 +1439,4 @@
     ..
     src             nochange
     ..
-    tests
-    ..
 ..