diff --git a/zsh.changes b/zsh.changes
index 77a55bf..892450b 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 16 03:49:21 UTC 2012 - crrodriguez@opensuse.org
+
+- Test suite runs flaky in qemu-arm, disable it for now. 
+
 -------------------------------------------------------------------
 Fri Oct 26 14:58:46 UTC 2012 - coolo@suse.com
 
diff --git a/zsh.spec b/zsh.spec
index 67e19bd..e3c5661 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -183,6 +183,7 @@ rm -f %{buildroot}%{_bindir}/zsh-*
 %endif
 
 %check
+%if ! 0%{?qemu_user_space_build}
 %if 0%{?suse_version}
 make check
 %else
@@ -197,7 +198,7 @@ mv Test/E01options.ztst Test/E01options.ztst.mvd
 %endif
   ZTST_verbose=0 make test
 %endif
-
+%endif
 %preun
 %if 0%{?suse_version}
   :