diff --git a/glibc.spec b/glibc.spec
index d777452..196185e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -170,7 +170,7 @@ Version: %{glibcversion}
 # - It allows using the Release number without the %%dist tag in the dependency
 #   generator to make the generated requires interchangeable between Rawhide
 #   and ELN (.elnYY < .fcXX).
-%global baserelease 22
+%global baserelease 23
 Release: %{baserelease}%{?dist}
 
 # Licenses:
@@ -2336,8 +2336,21 @@ run_tests () {
     done <rpmbuild.tests.sum.not-passing
   fi
 
+  # Compile and run the xtests, so that they can be run separately later.
+  # Reduce timeout factor to complete the tests in a reasonable time
+  # (in case something was made an xtest due to excessive run time).
+  # Do not look at the test results; they are expected to fail in most
+  # cases.
+  set -x
+  TIMEOUT_FACTOR=1 %make_build xcheck > rpmbuild.xcheck.log 2>&1 || true
+  if ! grep -Eq '^\s+=== Summary of results for extra tests ===$' rpmbuild.xcheck.log ; then
+    echo "FAIL: xcheck test suite build of target: $(basename "$(pwd)")" >& 2
+    cat rpmbuild.xcheck.log
+    exit 1
+  fi
+
   # Unconditonally dump differences in the system call list.
-  echo "* System call consistency checks:" >&2
+  : "* System call consistency checks:"
   cat misc/tst-syscall-list.out >&2
   set -x
 }
@@ -2661,6 +2674,9 @@ update_gconv_modules_cache ()
 %endif
 
 %changelog
+* Thu Sep 19 2024 Florian Weimer <fweimer@redhat.com> - 2.39-23
+- Ensure that xtests can be built (RHEL-59494)
+
 * Wed Jul 31 2024 Florian Weimer <fweimer@redhat.com> - 2.39-22
 - Support clearing options in /etc/resolv.conf, RES_OPTIONS with a - prefix
 - Introduce the strict-error/RES_STRICTERR stub resolver option (RHEL-18039)