diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template
index 44d83c9b3ad..5ee9191d585 100644
--- a/srcpkgs/python3-CherryPy/template
+++ b/srcpkgs/python3-CherryPy/template
@@ -1,22 +1,31 @@
 # Template file for 'python3-CherryPy'
 pkgname=python3-CherryPy
-version=18.6.0
-revision=4
+version=18.8.0
+revision=1
 wrksrc="CherryPy-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
-depends="python3-setuptools python3-Cheroot python3-portend
+make_check_args="--ignore cherrypy/test/test_session.py
+ --deselect cherrypy/test/test_states.py::ServerStateTests::test_2_KeyboardInterrupt"
+hostmakedepends="python3-wheel python3-setuptools_scm"
+depends="python3-more-itertools python3-Cheroot python3-portend
  python3-zc.lockfile python3-jaraco.collections"
+checkdepends="${depends} python3-path python3-requests
+ python3-requests-toolbelt python3-pytest"
 short_desc="Object-oriented HTTP framework (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="BSD-3-Clause"
-homepage="https://cherrypy.org/"
-changelog="https://raw.githubusercontent.com/cherrypy/cherrypy/master/CHANGES.rst"
+homepage="https://cherrypy.dev"
+changelog="https://raw.githubusercontent.com/cherrypy/cherrypy/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz"
-checksum=56608edd831ad00991ae585625e0206ed61cf1a0850e4b2cc48489fb2308c499
+checksum=9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b
 alternatives="cherrypy:cherryd:/usr/bin/cherryd3"
 
+pre_check() {
+	rm pytest.ini
+}
+
 post_install() {
+	rm -r ${DESTDIR}/${py3_sitelib}/cherrypy/{test,tutorial}
 	mv ${DESTDIR}/usr/bin/cherryd{,3}
 	vlicense LICENSE.md
 }