diff --git a/dev-python/bleach/bleach-3.1.0.ebuild b/dev-python/bleach/bleach-3.1.0-r1.ebuild
similarity index 65%
rename from dev-python/bleach/bleach-3.1.0.ebuild
rename to dev-python/bleach/bleach-3.1.0-r1.ebuild
index 386329537c313..51c292c42449c 100644
--- a/dev-python/bleach/bleach-3.1.0.ebuild
+++ b/dev-python/bleach/bleach-3.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 
 inherit distutils-r1
 
@@ -17,11 +17,8 @@ IUSE="test"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	dev-python/webencodings[${PYTHON_USEDEP}]
+"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-python_test() {
-	pytest -v || die "tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest