diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 84160bb5f6f..e4b12d19fc9 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -32,7 +32,6 @@ llvmpipe-traces:
 llvmpipe:
   variables:
     DEQP_SUITE: llvmpipe
-    XVFB_SCRIPT: "install/deqp-runner.sh"
     DEQP_FRACTION: 4
   extends:
     - .llvmpipe-deqp-test
@@ -43,10 +42,13 @@ llvmpipe:
     export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri"
     section_start weston "weston: prepare"
     WAYLAND_DISPLAY=wayland-0
-    weston --backend=headless-backend.so --socket="$WAYLAND_DISPLAY" --idle-time=0 &
+    export DISPLAY=:0
+    mkdir -p /tmp/.X11-unix
+    weston --config="$CI_PROJECT_DIR/install/common/weston.ini" --socket="$WAYLAND_DISPLAY" &
     export WAYLAND_DISPLAY
+    while [ ! -S /tmp/.X11-unix/X0 ]; do sleep 1; done
     section_end weston
-    xvfb-run -e results/xvfb.log --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"
+    $CI_PROJECT_DIR/install/deqp-runner.sh
 
 llvmpipe-full:
   extends: