diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild
index 90cf716925..40500353a2 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -11,16 +11,23 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
-IUSE=""
-RESTRICT="test"
+IUSE="test"
+RESTRICT="test !test? ( test )"
 
-RDEPEND=">=dev-lang/perl-5.6
+RDEPEND="
+	>=dev-lang/perl-5.6
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
+	sys-devel/gnuconfig
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/help2man
+"
+BDEPEND="
+	app-arch/gzip
+	test? ( dev-util/dejagnu )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r4.ebuild
index 50b2acc093..e8c72f202f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r4.ebuild
@@ -11,16 +11,23 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
-IUSE=""
-RESTRICT="test"
+IUSE="test"
+RESTRICT="test !test? ( test )"
 
-RDEPEND=">=dev-lang/perl-5.6
+RDEPEND="
+	>=dev-lang/perl-5.6
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
+	sys-devel/gnuconfig
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/help2man
+"
+BDEPEND="
+	app-arch/gzip
+	test? ( dev-util/dejagnu )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild
index 34c52da4c2..934356a4ba 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -36,15 +36,20 @@ SLOT="${PV:0:4}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-lang/perl-5.6
+RDEPEND="
+	>=dev-lang/perl-5.6
 	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
+	sys-devel/gnuconfig
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/gzip
 	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
 "
 
 PATCHES=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild
index 156318f9ba..5cf47a1e63 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild
@@ -36,15 +36,20 @@ SLOT="${PV:0:4}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-lang/perl-5.6
+RDEPEND="
+	>=dev-lang/perl-5.6
 	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
+	sys-devel/gnuconfig
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/gzip
 	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
 "
 
 PATCHES=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild
index 8935774850..0fef18d0c6 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild
@@ -36,15 +36,20 @@ SLOT="${PV:0:4}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-lang/perl-5.6
+RDEPEND="
+	>=dev-lang/perl-5.6
 	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
+	sys-devel/gnuconfig
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/gzip
 	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )
+	test? (
+		${PYTHON_DEPS}
+		dev-util/dejagnu
+	)
 "
 
 pkg_setup() {