diff --git a/python-websockets.changes b/python-websockets.changes
index ac745bf..e00786b 100644
--- a/python-websockets.changes
+++ b/python-websockets.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May  6 09:28:40 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Skip flaky tests for s390x
+
 -------------------------------------------------------------------
 Fri Feb 14 12:10:52 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
 
diff --git a/python-websockets.spec b/python-websockets.spec
index 3c82574..f315a4d 100644
--- a/python-websockets.spec
+++ b/python-websockets.spec
@@ -61,6 +61,16 @@ export WEBSOCKETS_TESTS_TIMEOUT_FACTOR=10
 donttest="test_close_waits_for_close_frame"
 # Disable broken tests with openssl 3.2 and python < 3.11
 donttest+=" or test_reject_invalid_server_certificate"
+
+%ifarch s390x
+# Skip flaky tests
+donttest+=" or test_context_takeover"
+donttest+=" or test_decompress_max_size"
+donttest+=" or test_encode_decode_fragmented_binary_frame"
+donttest+=" or test_encode_decode_fragmented_text_frame"
+donttest+=" or test_remote_no_context_takeove"
+%endif
+
 %pytest_arch -v -k "not ($donttest)" tests
 
 %files %{python_files}