diff --git a/.github/scripts/run-xserver-build-and-test.sh b/.github/scripts/ubuntu/run-xserver-build-and-test.sh
similarity index 72%
rename from .github/scripts/run-xserver-build-and-test.sh
rename to .github/scripts/ubuntu/run-xserver-build-and-test.sh
index 275e54e1ee..1b1b5cd7a6 100755
--- a/.github/scripts/run-xserver-build-and-test.sh
+++ b/.github/scripts/ubuntu/run-xserver-build-and-test.sh
@@ -15,9 +15,18 @@ fi
 echo "=== X11_BUILD_DIR=$X11_BUILD_DIR"
 echo "=== MESON_BUILDDIR=$MESON_BUILDDIR"
 
+export XTEST_DIR="$X11_BUILD_DIR/xts"
+export PIGLIT_DIR="$X11_BUILD_DIR/piglit"
+
+.github/scripts/install-prereq.sh
+
 .github/scripts/meson-build.sh
 
 echo '[xts]' > $X11_BUILD_DIR/piglit/piglit.conf
 echo "path=$X11_BUILD_DIR/xts" >> $X11_BUILD_DIR/piglit/piglit.conf
 
 meson test -C "$MESON_BUILDDIR" --print-errorlogs
+
+.github/scripts/check-ddx-build.sh
+
+.github/scripts/manpages-check
diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index f0f6c77184..9f05d8fdf4 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -51,14 +51,8 @@ jobs:
                 key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
                 restore-keys: ${{ runner.name }}-x11-deps-
 
-            - name: generic prereq
-              run:  .github/scripts/install-prereq.sh
-
             - name: build and test
-              run:  .github/scripts/run-xserver-build-and-test.sh
-              env:
-                  XTEST_DIR:  ${{ env.X11_BUILD_DIR }}/xts
-                  PIGLIT_DIR: ${{ env.X11_BUILD_DIR }}/piglit
+              run:  .github/scripts/ubuntu/run-xserver-build-and-test.sh
 
             - name: archive build logs
               uses: actions/upload-artifact@v4
@@ -68,11 +62,6 @@ jobs:
                       __BUILD/meson-logs/*
                       __BUILD/test/piglit-results/*
 
-            - name: ddx build check
-              run:  .github/scripts/check-ddx-build.sh
-            - name: manpage check
-              run:  .github/scripts/manpages-check
-
     drivers-build-ubuntu:
         env:
             MESON_ARGS: -Dprefix=/usr -Dxorg-sdk=true -Dxorg=false -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Dxfbdev=false