diff --git a/dev-perl/Class-Unload/Class-Unload-0.110.0.ebuild b/dev-perl/Class-Unload/Class-Unload-0.110.0-r1.ebuild
similarity index 83%
rename from dev-perl/Class-Unload/Class-Unload-0.110.0.ebuild
rename to dev-perl/Class-Unload/Class-Unload-0.110.0-r1.ebuild
index 3cfde6678ec56..66d42f25aa666 100644
--- a/dev-perl/Class-Unload/Class-Unload-0.110.0.ebuild
+++ b/dev-perl/Class-Unload/Class-Unload-0.110.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=ILMARI
 DIST_VERSION=0.11
@@ -11,17 +11,18 @@ DESCRIPTION="Unload a class"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-perl/Class-Inspector"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-perl/Class-Inspector
+"
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		>=virtual/perl-Test-Simple-0.880
 		dev-perl/Test-Requires
 	)
 "
+
 src_test() {
 	local i;
 	elog "Install the following optional dependencies for comprehensive tests:"