diff --git a/gpg2.changes b/gpg2.changes
index 9441fad..195e1b1 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Oct  1 15:53:04 UTC 2011 - crrodriguez@opensuse.org
+
+- Test suite hangs in qemu-arm, workaround. 
+
 -------------------------------------------------------------------
 Wed Aug 31 10:00:35 UTC 2011 - puzel@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 68833e3..62ceb25 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -123,9 +123,11 @@ install -m 644 AUTHORS COPYING ChangeLog NEWS THANKS TODO doc/FAQ $RPM_BUILD_ROO
 %endif
 
 %check
+%if ! 0%{?qemu_user_space_build}
 make check
 $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p pubsplit-                    --uncompress <tests/openpgp/pubring.gpg  
 $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress <tests/openpgp/secring.gpg  
+%endif
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz