diff --git a/dev-python/pytest-benchmark/Manifest b/dev-python/pytest-benchmark/Manifest
index f02988a917..f59164a391 100644
--- a/dev-python/pytest-benchmark/Manifest
+++ b/dev-python/pytest-benchmark/Manifest
@@ -1 +1 @@
-DIST pytest-benchmark-3.4.1.tar.gz 322758 BLAKE2B d29254f412aee0955429e7957fa31e9443b3319bec256b601c456efa7020abbd5b4d9ed43799fda62f53f70f14de3f42a93b29b7366989294f037ec2ee3215fc SHA512 54fb5e3a176578b3c8f339878c7a9d047a0785befcbba42bb68c34b4b636d9b6f6a2097b36c5eefbbcf1a91f943bdae762c7978a0dba1af53514052f513ef4c5
+DIST pytest-benchmark-3.4.1.gh.tar.gz 322758 BLAKE2B d29254f412aee0955429e7957fa31e9443b3319bec256b601c456efa7020abbd5b4d9ed43799fda62f53f70f14de3f42a93b29b7366989294f037ec2ee3215fc SHA512 54fb5e3a176578b3c8f339878c7a9d047a0785befcbba42bb68c34b4b636d9b6f6a2097b36c5eefbbcf1a91f943bdae762c7978a0dba1af53514052f513ef4c5
diff --git a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
index 3cc5d7a495..f8eabdb12a 100644
--- a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
+++ b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
@@ -6,46 +6,42 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="py.test fixture for benchmarking code "
+DESCRIPTION="py.test fixture for benchmarking code"
 HOMEPAGE="
 	https://pypi.python.org/pypi/pytest-benchmark
 	https://github.com/ionelmc/pytest-benchmark
 "
-SRC_URI="https://github.com/ionelmc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ionelmc/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+DOCS=( {AUTHORS,CHANGELOG,README}.rst )
 
-RDEPEND="dev-python/py-cpuinfo[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
 BDEPEND="test? (
 	dev-python/aspectlib[${PYTHON_USEDEP}]
+	dev-python/elasticsearch-py[${PYTHON_USEDEP}]
 	dev-python/freezegun[${PYTHON_USEDEP}]
 	dev-python/hunter[${PYTHON_USEDEP}]
 	dev-python/pygal[${PYTHON_USEDEP}]
 	dev-python/pygaljs[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/elasticsearch-py[${PYTHON_USEDEP}]' python3_8 python3_9 )
 )"
 
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
+EPYTEST_DESELECT=(
+	tests/test_cli.py::test_help
+	tests/test_cli.py::test_help_compare
+)
 
-python_prepare() {
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		rm tests/test_elasticsearch_storage.py || die
-	fi
-}
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
 
 python_test() {
 	local -x PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}"
-	local epytest_args=(
-		-o markers=benchmark
-		--deselect tests/test_cli.py::test_help
-		--deselect tests/test_cli.py::test_help_compare
-	)
-
-	epytest "${epytest_args[@]}"
+	epytest -o markers=benchmark
 }