diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07065de..c5819e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install build dependencies
-        run: sudo dnf -y install clang cmake gtk4-devel ibus-devel libadwaita-devel libX11-devel libchewing-devel ibus gettext xorg-x11-server-Xvfb dbus-x11 util-linux
+        run: sudo dnf -y install clang cmake gtk4-devel ibus-devel libadwaita-devel libchewing-devel ibus gettext weston
 
       - name: Build
         run: |
@@ -28,7 +28,8 @@ jobs:
       - name: Test
         run: |
           glib-compile-schemas src/setup --targetdir=out/build/default/bin
-          xvfb-run -a cmake --build --preset default -t test --verbose
+          weston --no-config --socket=wl-headless --backend=headless &
+          WAYLAND_DISPLAY=wl-headless cmake --build --preset default -t test --verbose
 
   coverage:
     runs-on: ubuntu-latest
@@ -38,7 +39,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install build dependencies
-        run: sudo dnf -y install clang cmake gtk4-devel ibus-devel libadwaita-devel libX11-devel libchewing-devel ibus gettext xorg-x11-server-Xvfb dbus-x11 util-linux
+        run: sudo dnf -y install clang cmake gtk4-devel ibus-devel libadwaita-devel libchewing-devel ibus gettext weston
 
       - name: Install llvm
         run: |
@@ -62,7 +63,8 @@ jobs:
         run: |
           source "$HOME/.cargo/env"
           glib-compile-schemas src/setup --targetdir=out/build/c99-coverage/bin
-          xvfb-run -a cmake --build --preset c99-coverage -t test --verbose
+          weston --no-config --socket=wl-headless --backend=headless &
+          WAYLAND_DISPLAY=wl-headless cmake --build --preset c99-coverage -t test --verbose
           ./grcov . -s . -b . --keep-only 'src/*' --llvm  -t lcov -o coverage.lcov
 
       - name: Upload coverage reports to Codecov