diff --git a/dev-python/manhole/Manifest b/dev-python/manhole/Manifest
index 2d8dd7fb8f..940de3533f 100644
--- a/dev-python/manhole/Manifest
+++ b/dev-python/manhole/Manifest
@@ -1 +1 @@
-DIST manhole-1.6.0.tar.gz 30111 BLAKE2B e6cffb465d72d579d3c901b5f163248ea28f3a208d2b487207a4f2d949994b7b778808b19a3bde0047bc71c2fe1865a12f9dcc5ac4f5407745879c8648df6c89 SHA512 179a87529e371c4480b6ab0ad6cc6cc9e3942f4be339cacaf1f1b100e447b8b1f2903a03879e9df3376c86ced4421aa5a16d934c9b250f91715b28d03dca000a
+DIST manhole-1.8.0.tar.gz 30823 BLAKE2B 7de4966faaa5a386097d9e3015318f3df5422f9f4525347ea93bc1b3cc988236e2db9dcdf7c5e4f058ad816c74beebab210af65fd331e2347da9c05035a22128 SHA512 041452d602895f7ceaafc74ac50713acd470120b022a942946de83f90d2d839ee15b333dfc329f88597b13e0b3fee436af526beae95a3ff94e51376fd2cc27e6
diff --git a/dev-python/manhole/manhole-1.6.0.ebuild b/dev-python/manhole/manhole-1.8.0.ebuild
similarity index 75%
rename from dev-python/manhole/manhole-1.6.0.ebuild
rename to dev-python/manhole/manhole-1.8.0.ebuild
index 8c035eb8e2..ff8d55f963 100644
--- a/dev-python/manhole/manhole-1.6.0.ebuild
+++ b/dev-python/manhole/manhole-1.8.0.ebuild
@@ -8,27 +8,29 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
-MYPN="python-${PN}"
+MY_PN="python-${PN}"
 
 DESCRIPTION="Debugging manhole for python application"
 HOMEPAGE="
 	https://github.com/ionelmc/python-manhole
-	https://pypi.org/project/python-manhole
+	https://pypi.org/project/manhole
 "
-SRC_URI="https://github.com/ionelmc/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ionelmc/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="test? (
+DEPEND="
+	test? (
 		dev-python/eventlet[${PYTHON_USEDEP}]
 		dev-python/gevent[${PYTHON_USEDEP}]
 		dev-python/process-tests[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-)"
+	)
+"
 
-S="${WORKDIR}/${MYPN}-${PV}"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
@@ -36,13 +38,15 @@ distutils_enable_sphinx docs \
 				dev-python/sphinxcontrib-napoleon
 
 python_test() {
-	pytest -vv \
+	distutils_install_for_testing
+	epytest \
 			--deselect tests/test_manhole.py::test_non_daemon_connection \
 			--deselect tests/test_manhole.py::test_daemon_connection \
 			--deselect tests/test_manhole.py::test_uwsgi \
 			--deselect tests/test_manhole.py::test_fork_exec \
 			--deselect tests/test_manhole.py::test_connection_handler_exec[str] \
 			--deselect tests/test_manhole.py::test_connection_handler_exec[func] \
-			--deselect tests/test_manhole_cli.py::test_help || die
+			--deselect tests/test_manhole.py::test_environ_variable_activation \
+			--deselect tests/test_manhole_cli.py::test_help
 
 }