diff --git a/libhandy.spec b/libhandy.spec
index 96d4312..fd99802 100644
--- a/libhandy.spec
+++ b/libhandy.spec
@@ -2,7 +2,7 @@
 
 Name:           libhandy
 Version:        1.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Building blocks for modern adaptive GNOME apps
 License:        LGPL-2.1-or-later
 
@@ -23,7 +23,9 @@ BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.1
 # Support graphical tests in non-graphical environment
-BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  xwayland-run
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  mutter
 BuildRequires:  rsvg-pixbuf-loader
 
 # Retired in F34
@@ -71,9 +73,8 @@ developing applications that use %{name}.
 
 
 %check
-# No parallel test runs to try to avoid overwhellming Xvfb on some platforms
-%define _smp_build_ncpus 1
-%{shrink:xvfb-run -w 10 -d %meson_test}
+export NO_AT_BRIDGE=1
+%{shrink:xwfb-run -c mutter -- %meson_test}
 
 
 %files -f libhandy.lang
@@ -96,6 +97,9 @@ developing applications that use %{name}.
 
 
 %changelog
+* Tue Jul 23 2024 Tomas Popela <tpopela@redhat.com> - 1.8.3-3
+- Move away from xvfb-run (done by nielsdg@redhat.com in Fedora)
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.8.3-2
 - Bump release for June 2024 mass rebuild