diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 774918d704..f838c45f5f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -238,19 +238,14 @@ jobs:
         run: |
           tox -e pretest
 
-      - name: "Test API"
-        shell: bash
-        run: |
-          tox -e test-api,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
-            
-      - name: "Test API test_launcher"
+      - name: "Run compatible tests in parallel"
         uses: nick-fields/retry@v3
         with:
-          timeout_minutes: 10
+          timeout_minutes: 15
           max_attempts: 2
           shell: bash
           command: |
-            tox -e test-launcher,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
+            tox run-parallel -m ciparalleltests ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
 
       - name: "Test API test_server"
         uses: nick-fields/retry@v3
@@ -261,24 +256,6 @@ jobs:
           command: |
             tox -e test-server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
 
-      - name: "Test API test_local_server"
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 2
-          shell: bash
-          command: |
-            tox -e test-local_server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
-
-      - name: "Test API test_multi_server"
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 2
-          shell: bash
-          command: |
-            tox -e test-multi_server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
-
       - name: "Test API test_remote_workflow"
         uses: nick-fields/retry@v3
         with:
@@ -311,29 +288,6 @@ jobs:
           command: |
             tox -e test-service,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
 
-      - name: "Test API Entry"
-        shell: bash
-        run: |
-          tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
-
-      - name: "Test API test_custom_type_field"
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 2
-          shell: bash
-          command: |
-            tox -e test-custom_type_field,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
-
-      - name: "Test Operators"
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 2
-          shell: bash
-          command: |
-            tox -e test-operators,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
-
       - name: "Combine coverage results"
         shell: bash
         run: |
diff --git a/tox.ini b/tox.ini
index d89e3b7d75..c1b36ef38e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ envlist = pretest,test-{api,launcher,server,local_server,multi_server,api_entry,
 
 labels =
     othertests = pretest,test-{workflow,remote_workflow,remote_operator,service},posttest,kill-servers
+    ciparalleltests = test-{api,launcher,local_server,multi_server,api_entry,custom_type_field,operators},kill-servers
     
 isolated_build_env = build