diff --git a/python-Pillow.changes b/python-Pillow.changes
index a91b168..cb75157 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul  3 09:37:33 UTC 2019 - Oliver Kurz <okurz@suse.com>
+
+- Exclude the tests completely on s390x segfault on known and referenced issue
+
 -------------------------------------------------------------------
 Sun Jun  9 22:06:09 CEST 2019 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index dfcfcd9..ca0c8cc 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -108,7 +108,10 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 
 %check
 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
-%if %_arch == s390x || %_arch == s390x || %_arch == ppc || %_arch == ppc64
+%if %_arch == s390 || %_arch == s390x
+echo "WARNING ignoring tests completely due to https://github.com/python-pillow/Pillow/issues/1204 and segfault"
+%else
+%if %_arch == ppc || %_arch == ppc64
 $python selftest.py --installed || \
 echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204"
 $python setup.py test  || \
@@ -117,6 +120,7 @@ echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204
 $python selftest.py --installed
 $python setup.py test
 %endif
+%endif
 }
 
 %files %{python_files}