diff --git a/gjs.spec b/gjs.spec
index c9a18fe..ed0454c 100644
--- a/gjs.spec
+++ b/gjs.spec
@@ -29,7 +29,7 @@
 
 Name:           gjs
 Version:        1.80.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Javascript Bindings for GNOME
 
 # The following files contain code from Mozilla which
@@ -125,10 +125,11 @@ BuildRequires:  pkgconfig(sysprof-capture-4)
 BuildRequires:  gtk3
 # For dbus tests
 BuildRequires:  /usr/bin/dbus-run-session
-#dbus-x11, xvfb, mesa-dri-drivers for test suite
+#dbus-x11, xwfb, mesa-dri-drivers for test suite
 BuildRequires:  dbus-x11
 BuildRequires:  mesa-dri-drivers
-BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  mutter
+BuildRequires:  xwayland-run
 
 Requires: glib2%{?_isa} >= %{glib2_version}
 Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
@@ -284,7 +285,7 @@ pushd firefox-%{mozjs_version}/js/src
 popd
 %endif
 
-%{shrink:xvfb-run -s "-screen 0 1600x1200x24" %meson_test --timeout-multiplier=5}
+%{shrink:xwfb-run -c mutter -- %meson_test --timeout-multiplier=5}
 
 %files
 %license COPYING
@@ -309,6 +310,10 @@ popd
 %{_datadir}/installed-tests/
 
 %changelog
+* Mon Jul 08 2024 Florian Müllner <fmuellner@redhat.com> - 1.80.2-8
+- Replace xvfb dependency
+  Resolves: RHEL-36637
+
 * Mon Jul 01 2024 Florian Müllner <fmuellner@redhat.com> - 1.80.2-7
 - Bump bundled mozjs version
   Resolves: RHEL-45601