diff --git a/libglvnd.spec b/libglvnd.spec
index 2363c67..f9d138c 100644
--- a/libglvnd.spec
+++ b/libglvnd.spec
@@ -4,7 +4,7 @@
 
 Name:           libglvnd
 Version:        1.7.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
 Epoch:          1
 Summary:        The GL Vendor-Neutral Dispatch library
@@ -22,7 +22,10 @@ BuildRequires:  python3-libxml2
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
-BuildRequires:  xorg-x11-server-Xvfb
+# X11 testing
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  mutter
+BuildRequires:  xwayland-run
 
 %{?_without_mesa_glvnd_default:
 %global __provides_exclude_from %{_libdir}/%{name}
@@ -161,7 +164,7 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
 
 %check
 export DO_X11_TESTS=1
-xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
+xwfb-run -c mutter make check V=1 || \
 %ifarch s390x ppc64
     :
 %else
@@ -240,6 +243,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 
 
 %changelog
+* Wed Aug 07 2024 José Expósito <jexposit@redhat.com> - 1:1.7.0-6
+- Move away from xvfb-run
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.7.0-5
 - Bump release for June 2024 mass rebuild