diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 5384996c70..10ab3ed03e 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -34,9 +34,11 @@ jobs:
        max-parallel: 6
        matrix:
          python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.7']
+         test-type: ['standalone', 'cluster']
+         connection-type: ['hiredis', 'plain']
      env:
        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-     name: Python ${{ matrix.python-version }} tests
+     name: Python ${{ matrix.python-version }} ${{matrix.test-type}}-${{matrix.connection-type}} tests
      steps:
        - uses: actions/checkout@v2
        - name: install python
@@ -46,7 +48,7 @@ jobs:
        - name: run tests
          run: |
            pip install -r dev_requirements.txt
-           invoke tests
+           tox -e ${{matrix.test-type}}-${{matrix.connection-type}}
        - name: Upload codecov coverage
          uses: codecov/codecov-action@v2
          with:
diff --git a/tasks.py b/tasks.py
index 9291e7effb..880e70dcf0 100644
--- a/tasks.py
+++ b/tasks.py
@@ -55,7 +55,7 @@ def standalone_tests(c):
     """Run all Redis tests against the current python,
     with and without hiredis."""
     print("Starting Redis tests")
-    run("tox -e standalone-'{hiredis}'")
+    run("tox -e standalone-'{plain,hiredis}'")
 
 
 @task