diff --git a/.github/workflows/cloud-runner-aws-pipeline.yml b/.github/workflows/cloud-runner-aws-pipeline.yml
index c80e6c84..2d111be5 100644
--- a/.github/workflows/cloud-runner-aws-pipeline.yml
+++ b/.github/workflows/cloud-runner-aws-pipeline.yml
@@ -49,7 +49,8 @@ jobs:
         with:
           node-version: 12.x
       - run: yarn
-      - run: yarn test -i
+      - run: yarn run cli --help
+      - run: yarn test -i-aws
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -57,8 +58,6 @@ jobs:
           AWS_DEFAULT_REGION: eu-west-2
           DEBUG: true
           CLOUD_RUNNER_BRANCH: remote-builder/unified-providers
-          CLOUD_RUNNER_TESTS: true
-          CLOUD_RUNNER_CLUSTER: aws
           PROJECT_PATH: ${{ matrix.projectPath }}
           UNITY_VERSION: ${{ matrix.unityVersion }}
           TARGET_PLATFORM: ${{ matrix.targetPlatform }}
diff --git a/.github/workflows/cloud-runner-k8s-pipeline.yml b/.github/workflows/cloud-runner-k8s-pipeline.yml
index 4c9ad312..3381d748 100644
--- a/.github/workflows/cloud-runner-k8s-pipeline.yml
+++ b/.github/workflows/cloud-runner-k8s-pipeline.yml
@@ -51,13 +51,12 @@ jobs:
         with:
           node-version: 12.x
       - run: yarn
+      - run: yarn run cli --help
       - name: Cloud Runner Test Suite
-        run: yarn test -i
+        run: yarn test -i-k8s
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           DEBUG: true
-          CLOUD_RUNNER_TESTS: true
-          CLOUD_RUNNER_CLUSTER: k8s
           PROJECT_PATH: ${{ matrix.projectPath }}
           UNITY_VERSION: ${{ matrix.unityVersion }}
           TARGET_PLATFORM: ${{ matrix.targetPlatform }}