diff --git a/dev-python/atomiclong/atomiclong-0.1.1.ebuild b/dev-python/atomiclong/atomiclong-0.1.1.ebuild
index 7b15a08711..5b110c19aa 100644
--- a/dev-python/atomiclong/atomiclong-0.1.1.ebuild
+++ b/dev-python/atomiclong/atomiclong-0.1.1.ebuild
@@ -2,29 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+
 PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
-SRC_URI="https://files.pythonhosted.org/packages/86/8c/70aea8215c6ab990f2d91e7ec171787a41b7fbc83df32a067ba5d7f3324f/${P}.tar.gz"
-
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 DESCRIPTION="An AtomicLong type using CFFI."
 HOMEPAGE="https://github.com/dreid/atomiclong"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/atomiclong/atomiclong-9999.ebuild b/dev-python/atomiclong/atomiclong-9999.ebuild
index 788043a928..87c8abf50e 100644
--- a/dev-python/atomiclong/atomiclong-9999.ebuild
+++ b/dev-python/atomiclong/atomiclong-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+
 PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
@@ -16,17 +17,7 @@ HOMEPAGE="https://github.com/dreid/atomiclong"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die
-}
+distutils_enable_tests pytest