Index: etc/mtree/BSD.root.dist
===================================================================
--- etc/mtree/BSD.root.dist
+++ etc/mtree/BSD.root.dist
@@ -54,7 +54,7 @@
         ..
         gss
         ..
-        kyua
+        kyua             tags=package=tests
         ..
         mail
         ..
Index: etc/mtree/BSD.tests.dist
===================================================================
--- etc/mtree/BSD.tests.dist
+++ etc/mtree/BSD.tests.dist
@@ -3,7 +3,7 @@
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
-/set type=dir uname=root gname=wheel mode=0755
+/set type=dir uname=root gname=wheel mode=0755 tags=package=tests
 .
     bin
         cat
Index: etc/mtree/BSD.usr.dist
===================================================================
--- etc/mtree/BSD.usr.dist
+++ etc/mtree/BSD.usr.dist
@@ -168,7 +168,7 @@
     sbin
     ..
     share
-        atf
+        atf             tags=package=tests
         ..
         bsdconfig
             media
@@ -219,9 +219,9 @@
         doc
             IPv6
             ..
-            atf
+            atf             tags=package=tests
             ..
-            kyua
+            kyua             tags=package=tests
             ..
             legal
             ..
@@ -319,7 +319,7 @@
                     ..
                 ..
             ..
-            kyua
+            kyua             tags=package=tests
             ..
             libusb20
             ..
@@ -460,10 +460,10 @@
                 ..
             ..
         ..
-        kyua
-            misc
+        kyua             tags=package=tests
+            misc         tags=package=tests
             ..
-            store
+            store        tags=package=tests
             ..
         ..
         locale
Index: lib/atf/libatf-c++/Makefile
===================================================================
--- lib/atf/libatf-c++/Makefile
+++ lib/atf/libatf-c++/Makefile
@@ -28,6 +28,7 @@
 .include <src.opts.mk>
 .include <bsd.init.mk>
 
+PACKAGE=	tests
 LIB_CXX=	atf-c++
 PRIVATELIB=	true
 SHLIB_MAJOR=	2
Index: lib/atf/libatf-c/Makefile
===================================================================
--- lib/atf/libatf-c/Makefile
+++ lib/atf/libatf-c/Makefile
@@ -44,6 +44,7 @@
 ATF_BUILD_CPPFLAGS:=	${CPPFLAGS:M-[DILOWf]*}
 ATF_BUILD_CXXFLAGS:=	${CXXFLAGS:M-[DILOWf]*}
 
+PACKAGE=	tests
 LIB=		atf-c
 PRIVATELIB=	true
 SHLIB_MAJOR=	1
Index: libexec/atf/atf-check/Makefile
===================================================================
--- libexec/atf/atf-check/Makefile
+++ libexec/atf/atf-check/Makefile
@@ -31,6 +31,7 @@
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
+PACKAGE=	tests
 PROG_CXX=	atf-check
 SRCS=		atf-check.cpp
 MAN=		atf-check.1
Index: libexec/atf/atf-sh/Makefile
===================================================================
--- libexec/atf/atf-sh/Makefile
+++ libexec/atf/atf-sh/Makefile
@@ -31,6 +31,7 @@
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
+PACKAGE=	tests
 PROG_CXX=	atf-sh
 SRCS=		atf-sh.cpp
 MAN=		atf-sh.1 atf-sh.3
@@ -74,6 +75,7 @@
 
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
+SUBRTAGS=	package=tests
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
Index: share/doc/atf/Makefile
===================================================================
--- share/doc/atf/Makefile
+++ share/doc/atf/Makefile
@@ -32,5 +32,6 @@
 
 TOPDIR=		${SHAREDIR}/doc/atf
 TOP=		AUTHORS COPYING NEWS README
+TOPTAGS=	package=tests
 
 .include <bsd.prog.mk>
Index: usr.bin/kyua/Makefile
===================================================================
--- usr.bin/kyua/Makefile
+++ usr.bin/kyua/Makefile
@@ -6,6 +6,7 @@
 
 .PATH: ${KYUA_SRCDIR}
 
+PACKAGE=	tests
 PROG_CXX=	kyua
 SRCS=		main.cpp
 LIBADD=		kyua_cli kyua_drivers kyua_engine kyua_model kyua_store
@@ -41,20 +42,25 @@
 CONFS=		kyua.conf-default
 CONFSDIR=	${KYUA_CONFDIR}
 CONFSNAME=	kyua.conf
+CONFSDIRTAGS=	package=tests
 
 DOCS=		AUTHORS CONTRIBUTORS LICENSE
 DOCSDIR=	${KYUA_DOCDIR}
+DOCSTAGS=	package=tests
 
 EXAMPLES=	Kyuafile.top kyua.conf
 EXAMPLESDIR=	${KYUA_EGDIR}
+EXAMPLESTAGS=	package=tests
 .PATH:		${KYUA_SRCDIR}/examples
 
 MISC=		context.html index.html report.css test_result.html
 MISCDIR=	${KYUA_MISCDIR}
+MISCTAGS=	package=tests
 .PATH:		${KYUA_SRCDIR}/misc
 
 STORE=		migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.sql
 STOREDIR=	${KYUA_STOREDIR}
+STORETAGS=	package=tests
 .PATH:		${KYUA_SRCDIR}/store
 
 CLEANFILES+=	${MAN}