diff --git a/.github/scripts/install-prereq.sh b/.github/scripts/install-prereq.sh
index 0347ea1994..93b2be50dd 100755
--- a/.github/scripts/install-prereq.sh
+++ b/.github/scripts/install-prereq.sh
@@ -13,9 +13,6 @@ build_meson   drm               https://github.com/X11Libre/drm
 fi
 build_meson   libxcvt           https://github.com/X11Libre/libxcvt                      libxcvt-0.1.0
 build_meson   xorgproto         https://github.com/X11Libre/xorgproto                    xorgproto-2024.1
-if [ "$X11_OS" = "Darwin" ]; then
-build_ac      xset              https://github.com/X11Libre/xset                         xset-1.2.5
-fi
 
 # really must be build via autoconf instead of meson, otherwise piglit wont find the test programs
 build_ac_xts  xts               https://github.com/X11Libre/xts                          aae51229af810efba24412511f60602fab53eded
diff --git a/.github/scripts/macos/install-prereq.sh b/.github/scripts/macos/install-prereq.sh
new file mode 100755
index 0000000000..10e14ba421
--- /dev/null
+++ b/.github/scripts/macos/install-prereq.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+. .github/scripts/util.sh
+
+mkdir -p $X11_BUILD_DIR
+cd $X11_BUILD_DIR
+
+build_meson   rendercheck       https://github.com/X11Libre/rendercheck                  rendercheck-1.6
+build_meson   libxcvt           https://github.com/X11Libre/libxcvt                      libxcvt-0.1.0
+build_meson   xorgproto         https://github.com/X11Libre/xorgproto                    xorgproto-2024.1
+build_ac      xset              https://github.com/X11Libre/xset                         xset-1.2.5
diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index 10542247dc..0a1ef5be5c 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -200,13 +200,11 @@ jobs:
               with:
                 path: |
                     ${{ env.X11_PREFIX }}
-                    ${{ env.X11_BUILD_DIR }}/xts
-                    ${{ env.X11_BUILD_DIR }}/piglit
-                key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
+                key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/macos/install-prereq.sh') }}
                 restore-keys: ${{ runner.os }}-x11-deps-
 
             - name: generic prereq
-              run:  .github/scripts/install-prereq.sh
+              run:  .github/scripts/macos/install-prereq.sh
 
             - name: build
               run:  .gitlab-ci/meson-build.sh
@@ -246,6 +244,7 @@ jobs:
                   usesh: true
                   release: "14.3"
                   run:     ./.github/scripts/freebsd/run-xserver-build.sh
+
     xserver-build-dragonflybsd:
         runs-on: ubuntu-latest
         env: