diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 598028e8e..554f73284 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1025,13 +1025,10 @@ jobs:
         if [[ "${{ matrix.os }}" == macos-* ]]; then
             echo "Skipping Valgrind checks on OS X"
         else
-            if [[ "${{ matrix.clang-runtime }}" == "17" ]]; then
-                echo "Valgrind reports true for clang-runtime 17 due to problems with LLVM"
-                valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -v || true
-            else
-                echo "Running valgrind on passing tests"
-                valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -v
-            fi
+            echo "Running valgrind on passing tests"
+            CLANG_VERSION="${{ matrix.clang-runtime }}"
+            SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
+            valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -v
         fi
         export RETCODE=+$?
         echo ::endgroup::