diff --git a/hdf5.changes b/hdf5.changes
index 81eaad7..7bca816 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  8 11:37:06 UTC 2018 - eich@suse.com
+
+- Disable %check stage for mpich builds on s390(x) (bsc#1080022).
+
 -------------------------------------------------------------------
 Fri Jan 12 15:38:59 UTC 2018 - eich@suse.com
 
diff --git a/hdf5.spec b/hdf5.spec
index c89caae..9a73fb1 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -804,11 +804,13 @@ export HDF5_ALARM_SECONDS=3600
 export HDF5_Make_Ignore=yes
 %endif
 %{?with_hpc:%hpc_setup}
-%ifarch ppc ppc64 ppc64le
-make %{?_smp_mflags} check || { echo "Ignore transient make check failures for PowerPC. boo#1058563"; }
-%else
-make %{?_smp_mflags} check
-%endif
+ %ifarch ppc ppc64 ppc64le
+  make %{?_smp_mflags} check || { echo "Ignore transient make check failures for PowerPC. boo#1058563"; }
+ %else
+  %if "%{?mpi_flavor}" != "mpich" || ("%_arch" != "s390" && "%_arch" != "s390x")
+    make %{?_smp_mflags} check
+  %endif
+ %endif
 %endif
 
 %if %{without mpi}