diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 95a3361b3c6..d5ef29c51a9 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -63,7 +63,7 @@
         ..
         jail.conf.d     tags=package=jail
         ..
-        kyua            tags=package=tests
+        kyua            tags=package=kyua
         ..
         mail            tags=package=runtime
         ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 7fa3f769e53..f9577e3c808 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -238,7 +238,7 @@
             ..
             atf             tags=package=atf
             ..
-            kyua            tags=package=tests
+            kyua            tags=package=kyua
             ..
             legal
             ..
@@ -334,7 +334,7 @@
                     ..
                 ..
             ..
-            kyua            tags=package=tests
+            kyua            tags=package=kyua
             ..
             libusb20
             ..
@@ -483,10 +483,10 @@
                 ..
             ..
         ..
-        kyua            tags=package=tests
-            misc            tags=package=tests
+        kyua            tags=package=kyua
+            misc            tags=package=kyua
             ..
-            store           tags=package=tests
+            store           tags=package=kyua
             ..
         ..
         locale