2 files changed, 6 insertions, 13 deletions

diff --git a/bin/test/tests/Kyuafile b/bin/test/tests/Kyuafile
deleted file mode 100644
index b2e4b320dd89..000000000000
--- a/bin/test/tests/Kyuafile
+++ /dev/null
@@ -1,12 +0,0 @@
--- $FreeBSD$
-
-syntax(2)
-
-test_suite("FreeBSD")
-
--- Some tests in here are silently not run when the tests are executed as
--- root.  Explicitly tell Kyua to drop privileges.
---
--- TODO(jmmv): Kyua needs to do this by default, not only when explicitly
--- requested.  See https://code.google.com/p/kyua/issues/detail?id=6
-tap_test_program{name="legacy_test", required_user="unprivileged"}
diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile
index dfffbedd735a..be32dbb29bf8 100644
--- a/bin/test/tests/Makefile
+++ b/bin/test/tests/Makefile
@@ -3,8 +3,13 @@
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/bin/test
-KYUAFILE=	yes
 
 TAP_TESTS_SH=	legacy_test
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 .include <tap.test.mk>