diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -17,6 +17,8 @@
 # goal being to reduce the load on testers when a commit is known to fail.
 #
 
+env:
+    LLVM_HEAD_VERSION: "15"
 steps:
   #
   # Light pre-commit tests for things like formatting or when people forget
@@ -76,6 +78,9 @@
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
+    env:
+        CC: "clang-$$LLVM_HEAD_VERSION:"
+        CXX: "clang++-$$LLVM_HEAD_VERSION:"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -90,6 +95,9 @@
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
+    env:
+        CC: "clang-$$LLVM_HEAD_VERSION:"
+        CXX: "clang++-$$LLVM_HEAD_VERSION:"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -104,6 +112,9 @@
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
+    env:
+        CC: "clang-$$LLVM_HEAD_VERSION:"
+        CXX: "clang++-$$LLVM_HEAD_VERSION:"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -118,6 +129,9 @@
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
+    env:
+        CC: "clang-$$LLVM_HEAD_VERSION:"
+        CXX: "clang++-$$LLVM_HEAD_VERSION:"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -204,10 +218,13 @@
     timeout_in_minutes: 120
 
   - label: "Clang 13"
-    command: "libcxx/utils/ci/run-buildbot generic-clang-13"
+    command: "libcxx/utils/ci/run-buildbot generic-cxx2b"
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
+    env:
+        CC: "clang-13"
+        CXX: "clang++-13"
     agents:
       queue: "libcxx-builders"
       os: "linux"
@@ -218,7 +235,10 @@
     timeout_in_minutes: 120
 
   - label: "Clang 14"
-    command: "libcxx/utils/ci/run-buildbot generic-clang-14"
+    command: "libcxx/utils/ci/run-buildbot generic-cxx2b"
+    env:
+        CC: "clang-14"
+        CXX: "clang++-14"
     artifact_paths:
       - "**/test-results.xml"
       - "**/*.abilist"
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
@@ -263,22 +263,6 @@
                    -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-merged.cfg.in"
     check-runtimes
 ;;
-generic-clang-13)
-    export CC=clang-13
-    export CXX=clang++-13
-    clean
-    generate-cmake
-    check-runtimes
-    check-abi-list
-;;
-generic-clang-14)
-    export CC=clang-14
-    export CXX=clang++-14
-    clean
-    generate-cmake
-    check-runtimes
-    check-abi-list
-;;
 generic-gcc)
     export CC=gcc-12
     export CXX=g++-12