diff --git a/.github/workflows/MacOS-arm.yml b/.github/workflows/MacOS-arm.yml
index ff5bd09a7..8b89259fc 100644
--- a/.github/workflows/MacOS-arm.yml
+++ b/.github/workflows/MacOS-arm.yml
@@ -259,12 +259,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: osx15-arm-clang-clang-repl-20
+          - name: osx15-arm-clang-clang-repl-20-cppyy
             os: macos-15
             compiler: clang
             clang-runtime: '20'
             cling: Off
-            cppyy: Off
+            cppyy: On
           - name: osx15-arm-clang-clang-repl-19-cppyy
             os: macos-15
             compiler: clang
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
index 74d51af2b..2b6574a60 100644
--- a/.github/workflows/MacOS.yml
+++ b/.github/workflows/MacOS.yml
@@ -243,12 +243,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: osx13-x86-clang-clang-repl-20
+          - name: osx13-x86-clang-clang-repl-20-cppyy
             os: macos-13
             compiler: clang
             clang-runtime: '20'
             cling: Off
-            cppyy: Off
+            cppyy: On
           - name: osx13-x86-clang-clang-repl-19-cppyy
             os: macos-13
             compiler: clang
diff --git a/.github/workflows/Ubuntu-arm.yml b/.github/workflows/Ubuntu-arm.yml
index 10d0a50dd..64d5f8e01 100644
--- a/.github/workflows/Ubuntu-arm.yml
+++ b/.github/workflows/Ubuntu-arm.yml
@@ -261,12 +261,12 @@ jobs:
             cling: Off
             cppyy: Off
             coverage: true
-          - name: ubu24-arm-gcc12-clang-repl-20
+          - name: ubu24-arm-gcc12-clang-repl-20-cppyy
             os: ubuntu-24.04-arm
             compiler: gcc-12
             clang-runtime: '20'
             cling: Off
-            cppyy: Off
+            cppyy: On
           - name: ubu24-arm-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04-arm
             compiler: gcc-12
diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
index e9e7f3c13..f41edd4d2 100644
--- a/.github/workflows/Ubuntu.yml
+++ b/.github/workflows/Ubuntu.yml
@@ -247,12 +247,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu24-x86-gcc12-clang-repl-20
+          - name: ubu24-x86-gcc12-clang-repl-20-cppyy
             os: ubuntu-24.04
             compiler: gcc-12
             clang-runtime: '20'
             cling: Off
-            cppyy: Off
+            cppyy: On
           - name: ubu24-x86-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04
             compiler: gcc-12