diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6dd731f708..0a33a8e4e3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -118,6 +118,11 @@ jobs:
         run: cp stratisd.conf /usr/share/dbus-1/system.d
       - name: Check out stratis-cli
         run: git clone https://github.com/stratis-storage/stratis-cli.git
+      - name: Switch
+        run: |
+          git checkout -b mulkieran-improve-metadata-testing master
+          git pull https://github.com/mulkieran/testing.git improve-metadata-testing
+        working-directory: ./stratis-cli
       - name: Run stratis-cli tests
         run: >
           RUST_LOG=stratisd=debug
@@ -245,8 +250,6 @@ jobs:
         include:
           - rev: HEAD
             options: --post-test-check=verify-filesystem-symlinks --post-test-check=verify-pool-metadata --highest-revision-number=8
-          - rev: v3.6.2
-            options: --highest-revision-number=6
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -293,6 +296,11 @@ jobs:
       - name: Checkout revision ${{ matrix.rev }}
         run: git checkout -b new-branch ${{ matrix.rev }}
         working-directory: ./testing
+      - name: Switch
+        run: |
+          git checkout -b mulkieran-improve-metadata-testing master
+          git pull https://github.com/mulkieran/testing.git improve-metadata-testing
+        working-directory: ./testing
       - name: Run stratisd_cert.py
         run: >
           sudo