diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 1fb33654ac5b..9e3d08cac2e9 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -410,6 +410,8 @@
             unlink
             ..
         ..
+        vfs
+        ..
         vm
         ..
     ..
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 066c918188b4..0f20aa6aa9ae 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+=		vfs
 TESTS_SUBDIRS+=		vm
 
 # Items not integrated into kyua runs by default
diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile
new file mode 100644
index 000000000000..48f522634bfa
--- /dev/null
+++ b/tests/sys/vfs/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=		${TESTSBASE}/sys/vfs
+
+PLAIN_TESTS_SH+=	trailing_slash
+
+.include <bsd.test.mk>
diff --git a/tools/regression/vfs/trailing_slash.t b/tests/sys/vfs/trailing_slash.sh
similarity index 100%
rename from tools/regression/vfs/trailing_slash.t
rename to tests/sys/vfs/trailing_slash.sh