diff --git a/dev-python/spake2/Manifest b/dev-python/spake2/Manifest
index e785253..b73e42f 100644
--- a/dev-python/spake2/Manifest
+++ b/dev-python/spake2/Manifest
@@ -1,4 +1,4 @@
 DIST spake2-0.8.tar.gz 62425 BLAKE2B 64215362af26fff0785fdabf4282f7111a4cc917750827075b616f009cb1fa6373fc2325382c26b43c051aa5b94e414ca2a5223d9ab666289eb2d04723b15cb5 SHA512 908c377c831f4a11551973ca917b113d51a66c533d35fd19b2692fdb7e575ed2a5045d9b632bc55c37b68ad092f01dff5da191e9dfbfb5599b72844788438d68
-EBUILD spake2-0.8.ebuild 702 BLAKE2B 9268c6b9a9632bc085089e1c65249ae6a0e005e1cd7d6dac782de0bb6525033271a6b0801f8293d2efe860f2aa939456bdd348ff4ed47dc6b0f31f8bc7b79ea7 SHA512 5fe87b675407d171ba2014ba6947820c42624471c03952e4ffc56bc831c6d0be9ef0c8e5753b9a73cfd64eab1cf3c3c9bad1cf677eb7dbd22fe30ef8802e421f
-EBUILD spake2-9999.ebuild 702 BLAKE2B 9268c6b9a9632bc085089e1c65249ae6a0e005e1cd7d6dac782de0bb6525033271a6b0801f8293d2efe860f2aa939456bdd348ff4ed47dc6b0f31f8bc7b79ea7 SHA512 5fe87b675407d171ba2014ba6947820c42624471c03952e4ffc56bc831c6d0be9ef0c8e5753b9a73cfd64eab1cf3c3c9bad1cf677eb7dbd22fe30ef8802e421f
+EBUILD spake2-0.8.ebuild 774 BLAKE2B a18cdaf63edf9368d26c60e90b6472b80ee27559d77b037a22a82ca899a8f3ef3f7d0f4dc25121684cbf4fbca9ae237caf3444fb16263281a3f725d597f5f8df SHA512 f18de4f784ce8fc1dcb273f7a8c38fa42cc37b74ae1927b83f78af2feedb0fa9b4fcaa03a7e3b2b1444db1ed84fd6d3fb74ebf09a926740c8c6c4b627ac34b04
+EBUILD spake2-9999.ebuild 774 BLAKE2B a18cdaf63edf9368d26c60e90b6472b80ee27559d77b037a22a82ca899a8f3ef3f7d0f4dc25121684cbf4fbca9ae237caf3444fb16263281a3f725d597f5f8df SHA512 f18de4f784ce8fc1dcb273f7a8c38fa42cc37b74ae1927b83f78af2feedb0fa9b4fcaa03a7e3b2b1444db1ed84fd6d3fb74ebf09a926740c8c6c4b627ac34b04
 MISC metadata.xml 371 BLAKE2B 217e796d2688accc20d1345bcb40a494baa8809e90f1992fc72c5ba01ad240e6c5e651b4f70b2d01569fb74553ce1ac7b596bee58833c0fba5724260418a7539 SHA512 279d4030696b1d4f39bc56921d2c77b5e1544ef96544fe7cdc5ae8817a474377aaf93b6e9a9a1e91bf1cea75df0d22fe4043bce680c8ab0225c824efa786f27a
diff --git a/dev-python/spake2/spake2-0.8.ebuild b/dev-python/spake2/spake2-0.8.ebuild
index b6c3939..0c459dc 100644
--- a/dev-python/spake2/spake2-0.8.ebuild
+++ b/dev-python/spake2/spake2-0.8.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/warner/python-spake2.git"
+else
 	MY_PN="python-${PN}"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/warner/python-spake2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/warner/python-spake2.git"
 fi
 
 DESCRIPTION="Python implementation of SPAKE2"
 HOMEPAGE="https://github.com/warner/python-spake2"
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
+DEPEND=""
 RDEPEND="dev-python/hkdf[${PYTHON_USEDEP}]"
 BDEPEND=""
 
-distutils_enable_tests pytest
+python_test() {
+	"${EPYTHON}" setup.py speed || die
+}
diff --git a/dev-python/spake2/spake2-9999.ebuild b/dev-python/spake2/spake2-9999.ebuild
index b6c3939..0c459dc 100644
--- a/dev-python/spake2/spake2-9999.ebuild
+++ b/dev-python/spake2/spake2-9999.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/warner/python-spake2.git"
+else
 	MY_PN="python-${PN}"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/warner/python-spake2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/warner/python-spake2.git"
 fi
 
 DESCRIPTION="Python implementation of SPAKE2"
 HOMEPAGE="https://github.com/warner/python-spake2"
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
+DEPEND=""
 RDEPEND="dev-python/hkdf[${PYTHON_USEDEP}]"
 BDEPEND=""
 
-distutils_enable_tests pytest
+python_test() {
+	"${EPYTHON}" setup.py speed || die
+}