diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index b75ac8206..e9448b9fc 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
+CherryPy==8.9.1  # rq.filter: < 9.0.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 523d8bfe4..74ebfe63e 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -1,5 +1,5 @@
 beautifulsoup4
-CherryPy
+CherryPy<9.0.0
 coverage
 Flask
 httpbin
@@ -20,4 +20,6 @@ pytest-xvfb
 vulture
 
 #@ ignore: Jinja2, MarkupSafe
-#@ filter: pytest != 3.0.5
\ No newline at end of file
+#@ filter: pytest != 3.0.5
+# https://github.com/cherrypy/cheroot/pull/2
+#@ filter: CherryPy < 9.0.0
\ No newline at end of file