diff --git a/mysql.spec b/mysql.spec
index 3a2a5f4..fc99cea 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -128,7 +128,9 @@ gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
 
 make %{?_smp_mflags}
 make check
+%ifnarch s390x
 make test
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -356,7 +358,7 @@ fi
 
 %changelog
 * Tue Dec 21 2004 Tom Lane <tgl@redhat.com> 4.1.7-8
-- Run make test on all archs
+- Run make test on all archs except s390x (which seems to have a bdb issue)
 
 * Mon Dec 13 2004 Tom Lane <tgl@redhat.com> 4.1.7-7
 - Suppress someone's silly idea that libtool overhead can be skipped