diff --git a/dev-python/cachetools/cachetools-3.1.0.ebuild b/dev-python/cachetools/cachetools-3.1.0.ebuild
index 4059e3eb862f0..95b8c6679b06f 100644
--- a/dev-python/cachetools/cachetools-3.1.0.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.0.ebuild
@@ -14,13 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
index 4059e3eb862f0..95b8c6679b06f 100644
--- a/dev-python/cachetools/cachetools-3.1.1.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -14,13 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/cachetools/metadata.xml b/dev-python/cachetools/metadata.xml
index a0193029a6378..2ba64fba1ab4f 100644
--- a/dev-python/cachetools/metadata.xml
+++ b/dev-python/cachetools/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">cachetools</remote-id>
+		<remote-id type="github">tkem/cachetools</remote-id>
 	</upstream>
 </pkgmetadata>