diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 7b16268a..d8e1fbbc 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -24,7 +24,7 @@ jobs:
             token: softokn
           - test: bind
             token: softhsm
-    name: ${{ test }} (${{ token }})
+    name: ${{ matrix.test }} (${{ matrix.token }})
     container: fedora:rawhide
     steps:
       - name: Get Date for DNF cache entry
@@ -52,7 +52,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - if: ${{ token }} == 'kryoptic'
+      - if: ${{ matrix.token }} == 'kryoptic'
         name: Get Kryoptic
         id: kryoptic_setup
         run: |
@@ -61,7 +61,7 @@ jobs:
           git submodule update --init
           echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"
 
-      - if: ${{ token }} == 'kryoptic'
+      - if: ${{ matrix.token }} == 'kryoptic'
         name: OpenSSL build cache
         uses: actions/cache@v4
         id: cache
@@ -70,13 +70,13 @@ jobs:
             kryoptic/openssl/
           key: ${{ runner.os }}-ossl-${{ hashFiles('kryoptic/.git/modules/openssl/HEAD') }}
 
-      - if: ${{ token }} == 'kryoptic'
+      - if: ${{ matrix.token }} == 'kryoptic'
         name: Generate lock file
         run: |
           cd kryoptic
           cargo generate-lockfile
 
-      - if: ${{ token }} == 'kryoptic'
+      - if: ${{ matrix.token }} == 'kryoptic'
         name: Cache Rust dependencies
         uses: actions/cache@v4
         with:
@@ -88,7 +88,7 @@ jobs:
             kryoptic/target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('kryoptic/**/Cargo.lock') }}
 
-      - if: ${{ token }} == 'kryoptic'
+      - if: ${{ matrix.token }} == 'kryoptic'
         name: Build Kryoptic
         run: |
           cd kryoptic
@@ -105,4 +105,4 @@ jobs:
           PKCS11_MODULE: /usr/lib64/ossl-modules/pkcs11.so
           KRYOPTIC: ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}
         run: |
-          pushd tests/integration && bash -e ${{ test }}.sh %{{ token }}
+          pushd tests/integration && bash -e ${{ matrix.test }}.sh %{{ matrix.token }}