diff --git a/python-CherryPy.changes b/python-CherryPy.changes
index 2280a25..6dac192 100644
--- a/python-CherryPy.changes
+++ b/python-CherryPy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 16 13:34:59 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Increase timeouts for tests for s390x architecture, bsc#1218602
+
 -------------------------------------------------------------------
 Sun Jan 14 17:18:14 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-CherryPy.spec b/python-CherryPy.spec
index 9371237..43b3d8f 100644
--- a/python-CherryPy.spec
+++ b/python-CherryPy.spec
@@ -98,7 +98,16 @@ rm pytest.ini
 # skip all travis known fails as they would most likely fail in obs too
 export TRAVIS="true"
 # testCombinedTools fails with trace in cheroot tests
-%pytest -k 'not testCombinedTools'
+donttest="testCombinedTools"
+
+%if "%{_arch}" == "s390x"
+# Increase timeout for tests in OBS for s390x
+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
+%endif
+
+%pytest -k "not ($donttest)"
 
 %pre
 # If libalternatives is used: Removing old update-alternatives entries.