diff --git a/python-pytest-mpi.changes b/python-pytest-mpi.changes
index 3075013..8d18e1a 100644
--- a/python-pytest-mpi.changes
+++ b/python-pytest-mpi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 28 07:30:07 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Skip some tests that produces a Segmentation fault in s390x
+
 -------------------------------------------------------------------
 Thu Nov 10 15:24:16 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-pytest-mpi.spec b/python-pytest-mpi.spec
index e4928f6..0c5379d 100644
--- a/python-pytest-mpi.spec
+++ b/python-pytest-mpi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pytest-mpi
 #
-# Copyright (c) 2022 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
@@ -64,7 +64,13 @@ mpi plugin for pytest to collect information from openmpi-based tests.
 export PATH=${PATH}:%{_libdir}/mpi/gcc/%{mpiver}/bin
 source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh
 # Exclude test_fixtures, it fails for i586 arch with Segmentation fault
-%pytest -v -p pytester --runpytest=subprocess -k 'not test_fixtures'
+donttest="test_fixtures"
+%if "%{_arch}" == "s390x"
+# Exclude some test_mpi_ that fails for s390x arch with Segmentation fault
+donttest+=" or test_mpi_with_mpi or test_mpi_only_mpi or test_mpi_skip_under_mpi or test_mpi_xfail or test_mpi_xfail_under_mpi"
+%endif
+
+%pytest -v -p pytester --runpytest=subprocess -k "not ($donttest)"
 
 %files %{python_files}
 %doc README.md