diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index e6f40655b8b6..1ca3d4d6c7d8 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -412,6 +412,8 @@
         ..
         posixshm
         ..
+        vfs
+        ..
         vm
         ..
     ..
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 3ed85be370ae..a22214a1444d 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -13,6 +13,7 @@ TESTS_SUBDIRS+=		mqueue
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		opencrypto
 TESTS_SUBDIRS+=		posixshm
+TESTS_SUBDIRS+=		vfs
 TESTS_SUBDIRS+=		vm
 
 # Items not integrated into kyua runs by default
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