diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb2c1f61c..3ed206db2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,18 +173,28 @@ meson:
       XTEST_DIR: /root/xts
       PIGLIT_DIR: /root/piglit
       LP_NUM_THREADS: 0
+      MESON_DDX_BUILD_ARGS: >
+        -Dxwayland=${BUILD_XWAYLAND} -Dxorg=${BUILD_XORG} -Dxephyr=${BUILD_XEPHYR} -Dxvfb=${BUILD_XVFB} -Dxnest=${BUILD_XNEST}
+      BUILD_XEPHYR: true
+      BUILD_XNEST: true
+      BUILD_XORG: true
+      BUILD_XVFB: true
+      BUILD_XWAYLAND: true
+      MESON_EXTRA_ARGS: ${MESON_DDX_BUILD_ARGS}
 
 meson-noglamor:
     extends: meson
     variables:
-        MESON_EXTRA_ARGS: >
-          -Dglamor=false
+        MESON_EXTRA_ARGS: -Dglamor=false ${MESON_DDX_BUILD_ARGS}
 
 xwayland-nolibdecor:
     extends: meson
     variables:
-        MESON_EXTRA_ARGS: >
-          -Dlibdecor=false -Dxorg=false -Dxephyr=false -Dxvfb=false -Dxnest=false
+        BUILD_XEPHYR: false
+        BUILD_XNEST: false
+        BUILD_XORG: false
+        BUILD_XVFB: false
+        MESON_EXTRA_ARGS: -Dlibdecor=false ${MESON_DDX_BUILD_ARGS}
 
 mingw-cross-build:
     extends: .common-build-and-test