diff --git a/bluez.changes b/bluez.changes
index 777db57..58697af 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 23 14:41:38 UTC 2015 - rguenther@suse.com
+
+- Build the testsuite with -fstack-reuse=none to workaround broken
+  test setup.  [bnc#923768]
+
 -------------------------------------------------------------------
 Thu Mar 12 12:03:30 UTC 2015 - seife+obs@b1-systems.com
 
diff --git a/bluez.spec b/bluez.spec
index 2c5342e..4a115f9 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bluez
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010-2014 B1 Systems GmbH, Vohburg, Germany
 #
 # All modifications and additions to the file contributed by third parties
@@ -159,7 +159,7 @@ chmod 0644 *.py *.xml *.dtd
 
 %check
 %if ! 0%{?qemu_user_space_build}
-make check
+make check CFLAGS="%{optflags} -fstack-reuse=none"
 %endif
 
 %clean