diff --git a/.github/workflows/ci-github-actions-self-hosted.yaml b/.github/workflows/ci-github-actions-self-hosted.yaml
index 7508b20dd..499faacba 100644
--- a/.github/workflows/ci-github-actions-self-hosted.yaml
+++ b/.github/workflows/ci-github-actions-self-hosted.yaml
@@ -18,7 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jobname: [LLVM21-MPI-CUDA-Real-Full]
+        jobname: [LLVM21-MPI-CUDA-Real-Full,
+                  LLVM21-MPI-Real-CPU-Fast]
 
     #            GCC12-MPI-NoMPI-CUDA-Real-Full,
     #            GCC12-MPI-NoMPI-CUDA-Real-Debug-Full,
diff --git a/test/test_automation/ci/run_step.sh b/test/test_automation/ci/run_step.sh
index 4ed79e201..1d533201e 100755
--- a/test/test_automation/ci/run_step.sh
+++ b/test/test_automation/ci/run_step.sh
@@ -89,6 +89,19 @@ case "$1" in
 	      -DDCA_WITH_TESTS_FAST=1 \
               ${GITHUB_WORKSPACE}
       ;;
+      *"LLVM21-MPI-Real-CPU-Fast"*)
+        echo 'Configure for CPU-only build with LLVM/Clang and MPI'
+        cmake -GNinja \
+              -DCMAKE_C_COMPILER=mpicc \
+              -DCMAKE_CXX_COMPILER=mpic++ \
+              -DDCA_WITH_MPI=1 \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DTEST_RUNNER="mpiexec" \
+              -DMPIEXEC_NUMPROC_FLAG="-n" \
+              -DMPIEXEC_PREFLAGS="-mca btl self,tcp" \
+              -DDCA_WITH_TESTS_FAST=1 \
+              ${GITHUB_WORKSPACE}
+      ;;
     esac
     ;;