diff --git a/dev-python/autopep8/autopep8-1.4.4.ebuild b/dev-python/autopep8/autopep8-1.4.4.ebuild
index df9895f59c983..32d9b478846eb 100644
--- a/dev-python/autopep8/autopep8-1.4.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -22,7 +23,6 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND=">=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/autopep8/autopep8-1.5.4.ebuild b/dev-python/autopep8/autopep8-1.5.4.ebuild
index 4ebce4805b38d..2bc6afefadf67 100644
--- a/dev-python/autopep8/autopep8-1.5.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.5.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 4ebce4805b38d..2bc6afefadf67 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"