diff --git a/wayland.changes b/wayland.changes
index e557078..ec82761 100644
--- a/wayland.changes
+++ b/wayland.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 15 20:29:24 UTC 2013 - dmueller@suse.com
+
+- skip testsuite on QEMU Userspace build (fixes hang on ARMv6 build) 
+
 -------------------------------------------------------------------
 Thu Sep 19 21:58:52 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/wayland.spec b/wayland.spec
index 0c41e23..f65981c 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -117,8 +117,10 @@ rm -f "$b/%_libdir"/*.la;
 %fdupes %buildroot/%_prefix
 
 %check
+%if ! 0%{?qemu_user_space_build}
 mkdir -m go-rwx xdg;
 XDG_RUNTIME_DIR="$PWD/xdg" make check %{?_smp_mflags};
+%endif
 
 %post -n libwayland-client0 -p /sbin/ldconfig
 %postun -n libwayland-client0 -p /sbin/ldconfig