diff --git a/.github/scripts/install-prereq.sh b/.github/scripts/install-prereq.sh
index e04b95dde6..64ea27d1a2 100755
--- a/.github/scripts/install-prereq.sh
+++ b/.github/scripts/install-prereq.sh
@@ -17,7 +17,7 @@ build_ac      xorgproto         https://gitlab.freedesktop.org/xorg/proto/xorgpr
 if [ "$X11_OS" = "Darwin" ]; then
 build_ac      xset              https://gitlab.freedesktop.org/xorg/app/xset             xset-1.2.5
 fi
-build_ac_xts  xts               https://gitlab.freedesktop.org/xorg/test/xts             master     12a887c2c72c4258962b56ced7b0aec782f1ffed
+build_ac_xts  xts               https://gitlab.freedesktop.org/xorg/test/xts             master     aae51229af810efba24412511f60602fab53eded
 
 clone_source piglit             https://gitlab.freedesktop.org/mesa/piglit               main       265896c86f90cb72e8f218ba6a3617fca8b9a1e3
 
diff --git a/.github/scripts/util.sh b/.github/scripts/util.sh
index a85c456e73..1e2fade84e 100644
--- a/.github/scripts/util.sh
+++ b/.github/scripts/util.sh
@@ -100,25 +100,6 @@ build_ac_xts() {
         (
             cd $pkgname
             CFLAGS='-fcommon'
-            if [ "$X11_OS" = "Darwin" ]; then
-                # xts5/include/XtTest.h includes <X11/Intrinsic.h> => needs xt
-                # xts5/src/libXtaw/*.c include <X11/Xaw/*.h> and <X11/Xmu/*.h> => need xmu and xaw7
-                sed -E -i~ 's|(\[XTS\], \[)|\1xt xmu xaw7 |' configure.ac
-                # xts5/Xlib14/X{mb,wc}TextListToTextProperty.m define a function accepting `XTextProperty` but call it passing
-                #`XTextProperty*`; since the parameter is seemingly meant for output, accept it as pointer
-                sed -E -i~ -e 's|(XTextProperty)[[:space:]]+(text_prop_good)|\1 *\2|' -e 's|(style_good),[[:space:]]*&(text_prop_good)|\1,\2|' -e 's|text_prop_good\.|text_prop_good->|' xts5/Xlib14/X{mb,wc}TextListToTextProperty.m
-                # xts5/Xlib*/*.m forward-declare `strcpy()` which is incompatible with _FORTIFY_SOURCE > 0 where `strcpy` is
-                # a macro; set _FORTIFY_SOURCE to 0 as we don't care much about security in this test code
-                CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
-                # declarations for `XtAppSetError{,Msg}Handler()` in <X11/Intrinsic.h> (libXt) make it hard to write warning-
-                # free code: they want a noreturn-annotated handler as input but return old handler without noreturn annotation,
-                # so e.g. `XtAppSetErrorHandler(XtAppSetErrorHandler(NULL))` (similar to xts5/Xt13/XtAppSetError*Handler.m)
-                # doesn't compile complaining about incompatible function pointers, at least with Apple Clang 16 (not sure why
-                # it treats this warning as error by default though)
-                if cc -Werror=unknown-warning-option -Wincompatible-function-pointer-types -c -xc -o /dev/null /dev/null 2>/dev/null; then
-                    CFLAGS="$CFLAGS -Wno-error=incompatible-function-pointer-types"
-                fi
-            fi
             ./autogen.sh --prefix=$X11_PREFIX CFLAGS="$CFLAGS"
             make -j${FDO_CI_CONCURRENT:-4} install
         )