diff --git a/.cirrus.yml b/.cirrus.yml
index d4a99824b1..9c9a44ba87 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -268,6 +268,18 @@ ubuntu24_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+# Same as above, but using Clang and libc++
+ubuntu24_clang_libcpp_task:
+  container:
+    # Ubuntu 24.04 EOL: Jun 2029
+    dockerfile: ci/ubuntu-24.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+  env:
+    CC: clang-18
+    CXX: clang++-18
+    CXXFLAGS: -stdlib=libc++
+
 ubuntu22_task:
   container:
     # Ubuntu 22.04 EOL: June 2027
diff --git a/ci/ubuntu-24.04/Dockerfile b/ci/ubuntu-24.04/Dockerfile
index f4f98fa272..13dbac92cf 100644
--- a/ci/ubuntu-24.04/Dockerfile
+++ b/ci/ubuntu-24.04/Dockerfile
@@ -36,6 +36,8 @@ RUN apt-get update && apt-get -y install \
     unzip \
     wget \
     zlib1g-dev \
+    libc++-dev \
+    libc++abi-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*