diff --git a/dev-util/pkgconf/pkgconf-1.3.5.ebuild b/dev-util/pkgconf/pkgconf-1.3.5.ebuild
index 8161648cd17a2..e616d6b2b7ca0 100644
--- a/dev-util/pkgconf/pkgconf-1.3.5.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.5.ebuild
@@ -18,18 +18,24 @@ HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
 LICENSE="BSD-1"
 SLOT="0"
-IUSE="+pkg-config"
+IUSE="+pkg-config test"
 
 # tests require 'kyua'
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+DEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
 	pkg-config? (
 		!dev-util/pkgconfig
 		!dev-util/pkg-config-lite
 		!dev-util/pkgconfig-openbsd[pkg-config]
-	)"
+	)
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/pkgconf
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 8161648cd17a2..e616d6b2b7ca0 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -18,18 +18,24 @@ HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
 LICENSE="BSD-1"
 SLOT="0"
-IUSE="+pkg-config"
+IUSE="+pkg-config test"
 
 # tests require 'kyua'
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+DEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
 	pkg-config? (
 		!dev-util/pkgconfig
 		!dev-util/pkg-config-lite
 		!dev-util/pkgconfig-openbsd[pkg-config]
-	)"
+	)
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/pkgconf