diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index ae17129d666..1f45fcd3c76 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -8,8 +8,6 @@
     bin
         cat
         ..
-        chown
-        ..
         date
         ..
         dd
@@ -652,6 +650,8 @@
         ..
     ..
     usr.sbin
+        chown
+        ..
         etcupdate
         ..
         extattr
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 779b0efec5a..a231ab3b545 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7419,6 +7419,9 @@ OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
+OLD_DIRS+=usr/tests/bin/chown
+OLD_FILES+=usr/tests/bin/chown/Kyuafile
+OLD_FILES+=usr/tests/bin/chown/chown-f_test
 OLD_FILES+=usr/tests/bin/chown/units_basics
 OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/bin/sh/legacy_test
diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile
index fb13f3fb0ab..e627afc9181 100644
--- a/usr.sbin/chown/tests/Makefile
+++ b/usr.sbin/chown/tests/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/chown
+TESTSDIR=	${TESTSBASE}/usr.sbin/chown
 
 TAP_TESTS_SH=			chown-f_test