diff --git a/dev-python/betamax-matchers/Manifest b/dev-python/betamax-matchers/Manifest
index 4b2ac992e4c6e..7a529f1217627 100644
--- a/dev-python/betamax-matchers/Manifest
+++ b/dev-python/betamax-matchers/Manifest
@@ -1 +1 @@
-DIST betamax-matchers-0.4.0.tar.gz 4205 BLAKE2B d9f626b61195135b260b0b4d43e0f62ed18721aef7c03602e117c9efedecb88fc891972b30aceed1fc29502a0982a18f8a57ce264f81fb89906e455b70b9afa0 SHA512 325a8165205c21193b4c136aa4d35a855f9529d6ed5809a1306ae7a3e7a49790928b68104da04a918ff3673ad2ede3e4bd901019bde460a8e42e2c5d96fb8abf
+DIST betamax-matchers-0.4.0.gh.tar.gz 5228 BLAKE2B ac4f3ed3df559e26eb88068ef39fe7b890bb003881b95dfe6a72d8622773d76e3b3879a74f508e3849064121086868ba183e53c86387d59d1cc0a1640006bea2 SHA512 202255d9895b118d03efa20aa64f5b099045750dcb9a1ad3eda164d3da372207f1bee8a40f63cdf179da90cfc4380e5a004e5f9c94f006a6f3dbc64e29766c86
diff --git a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
index 32f4b5b914031..979694e6cc4a3 100644
--- a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
+++ b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
@@ -1,26 +1,27 @@
-# 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..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="A group of experimental matchers for Betamax"
 HOMEPAGE="https://github.com/betamaxpy/betamax_matchers"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/betamaxpy/betamax_matchers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/betamax-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# No tests
-RESTRICT=test
+distutils_enable_tests pytest