diff --git a/increase-tests-timeouts.patch b/increase-tests-timeouts.patch
new file mode 100644
index 0000000..e9ca7f6
--- /dev/null
+++ b/increase-tests-timeouts.patch
@@ -0,0 +1,23 @@
+Index: cheroot-9.0.0/cheroot/test/conftest.py
+===================================================================
+--- cheroot-9.0.0.orig/cheroot/test/conftest.py
++++ cheroot-9.0.0/cheroot/test/conftest.py
+@@ -9,7 +9,7 @@ import time
+ 
+ import pytest
+ 
+-from cheroot._compat import IS_MACOS, IS_WINDOWS  # noqa: WPS436
++from cheroot._compat import IS_MACOS, IS_WINDOWS, PLATFORM_ARCH  # noqa: WPS436
+ from cheroot.server import Gateway, HTTPServer
+ from cheroot.testing import (  # noqa: F401  # pylint: disable=unused-import
+     native_server, wsgi_server,
+@@ -28,6 +28,9 @@ def http_request_timeout():
+     if IS_WINDOWS:
+         computed_timeout *= 10
+ 
++    if PLATFORM_ARCH == 's390x':
++        computed_timeout *= 2
++
+     return computed_timeout
+ 
+ 
diff --git a/python-cheroot.changes b/python-cheroot.changes
index c202460..68fb06e 100644
--- a/python-cheroot.changes
+++ b/python-cheroot.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  3 07:56:40 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add patch to increase tests timeouts in s390x where tests take
+  a bit longer to run:
+  * increase-tests-timeouts.patch
+
 -------------------------------------------------------------------
 Fri Dec 29 18:07:41 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-cheroot.spec b/python-cheroot.spec
index a666aee..810a2eb 100644
--- a/python-cheroot.spec
+++ b/python-cheroot.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,8 @@ Source99:       cheroot.rpmlintrc
 Patch0:         no-pypytools.patch
 # PATCH-FIX-UPSTREAM no-relative-imports.patch bsc#[0-9]+ mcepl@suse.com
 Patch1:         no-relative-imports.patch
+# PATCH-FIX-SUSE increase-tests-timeouts.patch alarrosa@suse.com Tests take longer to run in s390x
+Patch2:         increase-tests-timeouts.patch
 BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module importlib-metadata if %python-base < 3.8}
 BuildRequires:  %{python_module jaraco.functools}