diff --git a/python-CherryPy.changes b/python-CherryPy.changes
index 6dac192..2d521da 100644
--- a/python-CherryPy.changes
+++ b/python-CherryPy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 25 11:54:48 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Disable more flaky tests in s390x, bsc#1218602
+
 -------------------------------------------------------------------
 Tue Jan 16 13:34:59 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-CherryPy.spec b/python-CherryPy.spec
index 43b3d8f..74542b2 100644
--- a/python-CherryPy.spec
+++ b/python-CherryPy.spec
@@ -105,6 +105,8 @@ donttest="testCombinedTools"
 sed -i "s/timeout=1/timeout=10/" cherrypy/test/helper.py
 sed -i "s/timeout=5/timeout=20/" cherrypy/test/helper.py
 sed -i "s/timeout=5/timeout=20/" cherrypy/test/test_states.py
+# flaky test
+donttest+=" or test_wait_publishes_periodically"
 %endif
 
 %pytest -k "not ($donttest)"