diff --git a/dev-python/hkdf/Manifest b/dev-python/hkdf/Manifest
index 9e68ab0..c272013 100644
--- a/dev-python/hkdf/Manifest
+++ b/dev-python/hkdf/Manifest
@@ -1,4 +1,4 @@
 DIST hkdf-0.0.3.tar.gz 6727 BLAKE2B b91d8b65929b6d886659cf85ddb294b3399dd90b155fa88fc1125daf1894c65924abdcd20a1b53a60e9e30e371b4ff9160b3d4630cfec741110eb3c0ae86c224 SHA512 abbd779e28c49eae08736089cd14336b4a2004e258c469412b5d9c384fbb1ae1d2cbb3b6397ef0fed6fdbcd82b0ad57207bff655aca3f65e387a1ba825be2562
-EBUILD hkdf-0.0.3.ebuild 730 BLAKE2B 557ecafa2e59a56793f0c96d7928f8317db258360b9ca4705806f6785dfa2d7b2ec50bc2f040f62269785dfdcb46a2ec3a79cf25ae61eb7f5ec1a7daad944ffa SHA512 b34dd769ca541ee15f0032486086eb2e11898881e87fd2f5c630af743a34addbd6182cd969cf6196c3d9f78938080f6dd412812cecd6d066ad90443c5ec349f2
-EBUILD hkdf-9999.ebuild 730 BLAKE2B 557ecafa2e59a56793f0c96d7928f8317db258360b9ca4705806f6785dfa2d7b2ec50bc2f040f62269785dfdcb46a2ec3a79cf25ae61eb7f5ec1a7daad944ffa SHA512 b34dd769ca541ee15f0032486086eb2e11898881e87fd2f5c630af743a34addbd6182cd969cf6196c3d9f78938080f6dd412812cecd6d066ad90443c5ec349f2
+EBUILD hkdf-0.0.3.ebuild 758 BLAKE2B df239a4efbceb0a9731d7039c0c5f495c65e8d14c5b024c05975f3240253446dfc8ff2028d1887d8cb40fad592bba654f889038a22a4d055e95dd77aa08e6651 SHA512 92bf16a9d117aee5c8ba960b4a13f956a045f31ce2905fc4bafbca3657a7be745ef630d76494b1601678ad555a22468d392e8272f868b3aa164b2bf3be2ae5c3
+EBUILD hkdf-9999.ebuild 758 BLAKE2B df239a4efbceb0a9731d7039c0c5f495c65e8d14c5b024c05975f3240253446dfc8ff2028d1887d8cb40fad592bba654f889038a22a4d055e95dd77aa08e6651 SHA512 92bf16a9d117aee5c8ba960b4a13f956a045f31ce2905fc4bafbca3657a7be745ef630d76494b1601678ad555a22468d392e8272f868b3aa164b2bf3be2ae5c3
 MISC metadata.xml 369 BLAKE2B c3bc91c2b31cc42d2b8a9d8f7da31e987596eb9ba9563cba4d282ec4f871b4f698eca92d700dc18116f59100e83f33da478c800bfd616c3a3f373b3659735b5e SHA512 e3107e5e2681063887cbc28a2137ccb895f6e2f1187d12b762b9c34f1628faae59de45a8ab26212abcaac64a1d32783060ebcbbcdc1c33bd113ffae1e24eb79a
diff --git a/dev-python/hkdf/hkdf-0.0.3.ebuild b/dev-python/hkdf/hkdf-0.0.3.ebuild
index 13f7178..b98708e 100644
--- a/dev-python/hkdf/hkdf-0.0.3.ebuild
+++ b/dev-python/hkdf/hkdf-0.0.3.ebuild
@@ -1,23 +1,23 @@
-# 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/casebeer/python-hkdf.git"
+else
 	EGIT_COMMIT="ba0e2eee8f50cc84706f816dbc57897319e2250c"
 	MY_PN="python-${PN}"
 	MY_P="${MY_PN}-${EGIT_COMMIT}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/casebeer/python-hkdf/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/casebeer/python-hkdf.git"
 fi
 
 DESCRIPTION="Python implementation of HKDF"
@@ -28,3 +28,5 @@ SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 BDEPEND=""
+
+distutils_enable_tests nose
diff --git a/dev-python/hkdf/hkdf-9999.ebuild b/dev-python/hkdf/hkdf-9999.ebuild
index 13f7178..b98708e 100644
--- a/dev-python/hkdf/hkdf-9999.ebuild
+++ b/dev-python/hkdf/hkdf-9999.ebuild
@@ -1,23 +1,23 @@
-# 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/casebeer/python-hkdf.git"
+else
 	EGIT_COMMIT="ba0e2eee8f50cc84706f816dbc57897319e2250c"
 	MY_PN="python-${PN}"
 	MY_P="${MY_PN}-${EGIT_COMMIT}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/casebeer/python-hkdf/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/casebeer/python-hkdf.git"
 fi
 
 DESCRIPTION="Python implementation of HKDF"
@@ -28,3 +28,5 @@ SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 BDEPEND=""
+
+distutils_enable_tests nose