diff --git a/sys-apps/xbps/xbps-0.58.ebuild b/sys-apps/xbps/xbps-0.58.ebuild
index 10a9f91..0a66f63 100644
--- a/sys-apps/xbps/xbps-0.58.ebuild
+++ b/sys-apps/xbps/xbps-0.58.ebuild
@@ -33,10 +33,12 @@ BDEPEND="
 "
 DEPEND="
 	sys-libs/zlib
+	test? (
+		>=dev-libs/atf-0.15
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	test? ( >=dev-libs/atf-0.15 )
 "
 
 src_configure() {
diff --git a/sys-apps/xbps/xbps-9999.ebuild b/sys-apps/xbps/xbps-9999.ebuild
index 10a9f91..0a66f63 100644
--- a/sys-apps/xbps/xbps-9999.ebuild
+++ b/sys-apps/xbps/xbps-9999.ebuild
@@ -33,10 +33,12 @@ BDEPEND="
 "
 DEPEND="
 	sys-libs/zlib
+	test? (
+		>=dev-libs/atf-0.15
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	test? ( >=dev-libs/atf-0.15 )
 "
 
 src_configure() {