diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index ae0eb7c..07d0ffc 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -11,6 +11,10 @@ on:
 
 jobs:
   selftest:
+    strategy:
+      matrix:
+        sigstore-env: [production, staging]
+      fail-fast: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -27,11 +31,5 @@ jobs:
         uses: ./
         with:
           entrypoint: ${{ github.workspace }}/sigstore-python-conformance
-          xfail: "test_verify_with_trust_root test_verify_dsse_bundle_with_trust_root test_verify_v_0_3"
-
-      - name: Staging conformance test sigstore-python
-        uses: ./
-        with:
-          entrypoint: ${{ github.workspace }}/sigstore-python-conformance
-          environment: staging
+          environment: ${{ matrix.sigstore-env }}
           xfail: "test_verify_with_trust_root test_verify_dsse_bundle_with_trust_root test_verify_v_0_3"