diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 342455a51768..540b1521ba2d 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -736,6 +736,8 @@
         ..
         uniq
         ..
+        vmstat
+        ..
         xargs
         ..
         xinstall
diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile
index 4fd0994117b7..72734cc69c3e 100644
--- a/usr.bin/vmstat/Makefile
+++ b/usr.bin/vmstat/Makefile
@@ -1,10 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	vmstat
 MAN=	vmstat.8
 LIBADD=	devstat kvm memstat xo util
 
 WARNS?=	6
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/vmstat/tests/Makefile b/usr.bin/vmstat/tests/Makefile
new file mode 100644
index 000000000000..d5c3b2a0469f
--- /dev/null
+++ b/usr.bin/vmstat/tests/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+NETBSD_ATF_TESTS_SH=	vmstat_test
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>