diff --git a/dev-python/click/click-6.7-r2.ebuild b/dev-python/click/click-6.7-r2.ebuild
index e6afce4e9b40c..4a02313d5fb2c 100644
--- a/dev-python/click/click-6.7-r2.ebuild
+++ b/dev-python/click/click-6.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,24 +14,17 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
 
 PATCHES=(
 	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-fix-tests.patch"
+	"${FILESDIR}"/${PN}-6.7-fix-tests.patch
 	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
+	"${FILESDIR}"/${PN}-6.7-support-sphinx-1.7.patch
 )
 
-python_test() {
-	emake test
-}
-
 python_install_all() {
 	use examples && dodoc -r examples
 	distutils-r1_python_install_all