diff --git a/weston.spec b/weston.spec
index 8ccf1ea..1c6dad9 100644
--- a/weston.spec
+++ b/weston.spec
@@ -58,7 +58,6 @@ BuildRequires:  pkgconfig(libdrm) >= 2.4.30
 BuildRequires:  pkgconfig(libffi)
 BuildRequires:  pkgconfig(libsystemd-login) >= 198
 BuildRequires:  pkgconfig(libudev) >= 136
-BuildRequires:  pkgconfig(libunwind)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
 BuildRequires:  pkgconfig(pixman-1)
@@ -107,7 +106,7 @@ if [ ! -e configure ]; then
 fi
 # Ensure people will use pkgconfig to locate headers.
 %configure --disable-static --includedir="%_includedir/pkg/%name" \
-	--disable-setuid-install --disable-rpi-compositor
+	--disable-setuid-install --disable-libunwind
 make %{?_smp_mflags}
 
 %install
@@ -116,12 +115,11 @@ find "%buildroot" -type f -name "*.la" -delete -print
 
 %check
 %if !0%{?qemu_user_space_build}
-export BACKEND=headless-backend.so
 export XDG_RUNTIME_DIR="$PWD/xdg"
 mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
-if ! make check; then
+if ! make BACKEND=headless-backend.so check; then
 	cat test-suite.log
-	# make check can not pass completely with headless backend.
+	# make check can not pass completely without an actual screen.
 	#exit 1
 fi
 %endif