diff --git a/misc/requirements/requirements-tests-git.txt b/misc/requirements/requirements-tests-git.txt
index fa89aa4de..68f93bc7a 100644
--- a/misc/requirements/requirements-tests-git.txt
+++ b/misc/requirements/requirements-tests-git.txt
@@ -1,5 +1,5 @@
 bzr+lp:beautifulsoup
-git+https://github.com/cherrypy/cherrypy.git
+git+https://github.com/cherrypy/cheroot.git
 hg+https://bitbucket.org/ned/coveragepy
 git+https://github.com/micheles/decorator.git
 git+https://github.com/pallets/flask.git
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 5ca2b0418..9a9b60d83 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 beautifulsoup4==4.5.3
-CherryPy==8.9.1  # rq.filter: < 9.0.0
+cheroot==5.1.0
 click==6.7
 coverage==4.3.4
 decorator==4.0.11
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index a0b8c1e3a..619095ad8 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -1,5 +1,5 @@
 beautifulsoup4
-CherryPy<9.0.0
+cheroot
 coverage
 Flask
 httpbin
@@ -20,5 +20,3 @@ pytest-xvfb
 vulture
 
 #@ ignore: Jinja2, MarkupSafe
-# https://github.com/cherrypy/cheroot/pull/2
-#@ filter: CherryPy < 9.0.0
\ No newline at end of file
diff --git a/scripts/dev/freeze_tests.py b/scripts/dev/freeze_tests.py
index 9c57b10e1..082d4e999 100755
--- a/scripts/dev/freeze_tests.py
+++ b/scripts/dev/freeze_tests.py
@@ -55,8 +55,7 @@ def get_build_exe_options():
     opts = freeze.get_build_exe_options(skip_html=True)
     opts['includes'] += pytest.freeze_includes()
     opts['includes'] += ['unittest.mock', 'PyQt5.QtTest', 'hypothesis', 'bs4',
-                         'httpbin', 'jinja2.ext', 'cherrypy.wsgiserver',
-                         'pstats']
+                         'httpbin', 'jinja2.ext', 'cheroot', 'pstats']
 
     httpbin_dir = os.path.dirname(httpbin.__file__)
     opts['include_files'] += [
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 0fa1d7139..df84d26d6 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -31,7 +31,7 @@ import threading
 
 from httpbin.core import app
 from httpbin.structures import CaseInsensitiveDict
-import cherrypy.wsgiserver
+import cheroot.wsgi
 import flask
 
 
@@ -135,7 +135,7 @@ def log_request(response):
     return response
 
 
-class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
+class WSGIServer(cheroot.wsgi.Server):
 
     """A custom WSGIServer that prints a line on stderr when it's ready.