diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -449,6 +449,10 @@
     clean
 
     echo "--- Generating CMake"
+    # TODO: We currently enable modules and assertions in the runtimes build
+    #       because that provides coverage for some specific Clang failures
+    #       we've been seeing recently, however it would be better to instead
+    #       run all CI configurations against a Clang that has assertions enabled.
     ${CMAKE} \
           -S "${MONOREPO_ROOT}/llvm" \
           -B "${BUILD_DIR}" \
@@ -458,7 +462,8 @@
           -DLLVM_ENABLE_PROJECTS="clang" \
           -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
           -DLLVM_RUNTIME_TARGETS="x86_64-unknown-linux-gnu" \
-          -DLLVM_ENABLE_ASSERTIONS=ON
+          -DLLVM_ENABLE_ASSERTIONS=ON \
+          -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules.cmake"
 
     echo "+++ Running the libc++ and libc++abi tests"
     ${NINJA} -C "${BUILD_DIR}" check-runtimes