diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml
index 78b27735a3..cb5e0d5397 100644
--- a/.github/workflows/tox.yaml
+++ b/.github/workflows/tox.yaml
@@ -7,27 +7,29 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        python: ['3.10', '3.11', '3.12']
         include:
-          - python: '3.11'
-            os: ubuntu-latest
-            evm-type: 'develop'
-            tox-cmd: 'tox -e tests-develop'
-          - python: '3.11'
-            os: macos-latest
+          - os: ubuntu-latest
+            python: '3.10'
+            evm-type: 'main'
+          - os: ubuntu-latest
+            python: '3.11'
             evm-type: 'develop'
-            tox-cmd: 'tox -e tests-develop'
-          - python: '3.10'
+          - os: ubuntu-latest
+            python: '3.12'
             evm-type: 'main'
-            tox-cmd: 'tox run-parallel --parallel-no-spinner'
-          - python: '3.12'
+          - os: macos-latest
+            python: '3.11'
             evm-type: 'main'
-            tox-cmd: 'tox run-parallel --parallel-no-spinner'
-        exclude:
-          - python: '3.11'
-            evm-type: 'main' 
+      env: 
+        tox-main: 'tox run-parallel --parallel-no-spinner'
+        tox-develop: 'tox -e tests-develop'
     steps:
+      - name: Set Tox Command
+        run: |
+          if [ "${{ matrix.evm-type }}" = "develop" ]; then
+            echo "TOX_CMD=${{ env.tox-cmd-develop }}" >> $GITHUB_ENV
+          else
+            echo "TOX_CMD=${{ env.tox-cmd-main }}" >> $GITHUB_ENV
       - uses: actions/checkout@v3
         with:
           submodules: true
@@ -53,7 +55,7 @@ jobs:
       - name: Install Tox and any other packages
         run: pip install tox
       - name: Run Tox (CPython)
-        run: ${{ matrix.tox-cmd }}
+        run: $TOX_CMD
       - uses: DavidAnson/markdownlint-cli2-action@v11
         with:
           globs: |