diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index cb904bc8cafa..c9c52a41b0fe 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -404,6 +404,8 @@
             unlink
             ..
         ..
+        vm
+        ..
     ..
     usr.bin
         apply
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index e67f609fe14a..066c918188b4 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -12,6 +12,7 @@ TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		mqueue
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		opencrypto
+TESTS_SUBDIRS+=		vm
 
 # Items not integrated into kyua runs by default
 SUBDIR+=		pjdfstest
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index 3d2127f128a1..d366aa1d61ff 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -3,7 +3,6 @@
 TESTSDIR=	${TESTSBASE}/sys/kern
 
 ATF_TESTS_C+=	kern_descrip_test
-TAP_TESTS_C+=	mmap_test
 ATF_TESTS_C+=	unix_seqpacket_test
 TEST_METADATA.unix_seqpacket_test+=	timeout="15"
 
diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile
new file mode 100644
index 000000000000..1795eefa6a52
--- /dev/null
+++ b/tests/sys/vm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sys/vm
+
+TAP_TESTS_C+=	mmap_test
+
+.include <bsd.test.mk>
diff --git a/tests/sys/kern/mmap_test.c b/tests/sys/vm/mmap_test.c
similarity index 100%
rename from tests/sys/kern/mmap_test.c
rename to tests/sys/vm/mmap_test.c