diff --git a/.github/workflows/turborepo-test.yml b/.github/workflows/turborepo-test.yml
index 1f64de74621e4..f78ce245847fe 100644
--- a/.github/workflows/turborepo-test.yml
+++ b/.github/workflows/turborepo-test.yml
@@ -105,7 +105,7 @@ jobs:
           fi
 
   integration:
-    name: Turborepo Integration
+    name: Turborepo Integration (${{ matrix.os.runner }}, ${{ matrix.test-path }})
     needs:
       - find-changes
     runs-on: ${{ matrix.os.runner }}
@@ -117,6 +117,26 @@ jobs:
           - runner: ubuntu-latest
           - runner: macos-latest
           - runner: windows-latest
+        test-path:
+          - clone
+          - daemon
+          - dry-json
+          - edit-turbo-json
+          - find-turbo
+          - inference
+          - jsonc
+          - lockfile-aware-caching
+          - persistent-dependencies
+          - prune
+          - query
+          - run
+          - run-caching
+          - run-logging
+          - run-summary
+          - strict-env-vars
+          - task-dependencies
+          - workspace-configs
+          - other
     steps:
       # On Windows, set autocrlf to input so that when the repo is cloned down
       # the fixtures retain their line endings and don't get updated to CRLF.
@@ -186,7 +206,7 @@ jobs:
           if [ -z "${RUSTC_WRAPPER}" ]; then
             unset RUSTC_WRAPPER
           fi
-          turbo run test --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }}
+          turbo run test --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} -- "tests/${{ matrix.test-path }}"
         shell: bash
         env:
           SCCACHE_BUCKET: turborepo-sccache
diff --git a/turborepo-tests/integration/tests/affected-rdeps.t b/turborepo-tests/integration/tests/other/affected-rdeps.t
similarity index 88%
rename from turborepo-tests/integration/tests/affected-rdeps.t
rename to turborepo-tests/integration/tests/other/affected-rdeps.t
index 44b8e8762761f..54f3cb1fc894e 100644
--- a/turborepo-tests/integration/tests/affected-rdeps.t
+++ b/turborepo-tests/integration/tests/other/affected-rdeps.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 Create a new branch
   $ git checkout -b my-branch
diff --git a/turborepo-tests/integration/tests/affected.t b/turborepo-tests/integration/tests/other/affected.t
similarity index 99%
rename from turborepo-tests/integration/tests/affected.t
rename to turborepo-tests/integration/tests/other/affected.t
index 81a21e4159903..99670e19a77df 100644
--- a/turborepo-tests/integration/tests/affected.t
+++ b/turborepo-tests/integration/tests/other/affected.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 Create a new branch
   $ git checkout -b my-branch
diff --git a/turborepo-tests/integration/tests/bad-flag.t b/turborepo-tests/integration/tests/other/bad-flag.t
similarity index 96%
rename from turborepo-tests/integration/tests/bad-flag.t
rename to turborepo-tests/integration/tests/other/bad-flag.t
index a5c5a4ea978ec..f101c609484db 100644
--- a/turborepo-tests/integration/tests/bad-flag.t
+++ b/turborepo-tests/integration/tests/other/bad-flag.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
 
 Bad flag should print misuse text
   $ ${TURBO} --bad-flag
diff --git a/turborepo-tests/integration/tests/bad-turbo-json.t b/turborepo-tests/integration/tests/other/bad-turbo-json.t
similarity index 88%
rename from turborepo-tests/integration/tests/bad-turbo-json.t
rename to turborepo-tests/integration/tests/other/bad-turbo-json.t
index 35e4da02413a1..494f0df2eee1e 100644
--- a/turborepo-tests/integration/tests/bad-turbo-json.t
+++ b/turborepo-tests/integration/tests/other/bad-turbo-json.t
@@ -1,8 +1,8 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 Add turbo.json with unnecessary package task syntax to a package
-  $ . ${TESTDIR}/../../helpers/replace_turbo_json.sh $(pwd)/apps/my-app "package-task.json"
+  $ . ${TESTDIR}/../../../helpers/replace_turbo_json.sh $(pwd)/apps/my-app "package-task.json"
 
 Run build with package task in non-root turbo.json
   $ ${TURBO} build 2> error.txt
@@ -32,7 +32,7 @@ Remove unnecessary package task syntax
   $ rm $(pwd)/apps/my-app/turbo.json
 
 Use our custom turbo config with an invalid env var
-  $ . ${TESTDIR}/../../helpers/replace_turbo_json.sh $(pwd) "invalid-env-var.json"
+  $ . ${TESTDIR}/../../../helpers/replace_turbo_json.sh $(pwd) "invalid-env-var.json"
 
 Run build with invalid env var
   $ ${TURBO} build 2> error.txt
@@ -70,7 +70,7 @@ Run in single package mode even though we have a task with package syntax
   
 
 Use our custom turbo config which has interruptible: true
-  $ . ${TESTDIR}/../../helpers/replace_turbo_json.sh $(pwd) "interruptible-but-not-persistent.json"
+  $ . ${TESTDIR}/../../../helpers/replace_turbo_json.sh $(pwd) "interruptible-but-not-persistent.json"
 
 Build should fail
   $ ${TURBO} run build
@@ -86,7 +86,7 @@ Build should fail
   [1]
 
 Use our custom turbo config with syntax errors
-  $ . ${TESTDIR}/../../helpers/replace_turbo_json.sh $(pwd) "syntax-error.json"
+  $ . ${TESTDIR}/../../../helpers/replace_turbo_json.sh $(pwd) "syntax-error.json"
 
 Run build with syntax errors in turbo.json
   $ ${TURBO} build
diff --git a/turborepo-tests/integration/tests/command-bin.t b/turborepo-tests/integration/tests/other/command-bin.t
similarity index 79%
rename from turborepo-tests/integration/tests/command-bin.t
rename to turborepo-tests/integration/tests/other/command-bin.t
index e3fe9ef069b77..5e0e634d1a8cd 100644
--- a/turborepo-tests/integration/tests/command-bin.t
+++ b/turborepo-tests/integration/tests/other/command-bin.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh --no-install
 
   $ ${TURBO} bin -vvv > out.log 2>&1
   $ grep --quiet "Global turbo version: .*" out.log
diff --git a/turborepo-tests/integration/tests/command-link.t b/turborepo-tests/integration/tests/other/command-link.t
similarity index 75%
rename from turborepo-tests/integration/tests/command-link.t
rename to turborepo-tests/integration/tests/other/command-link.t
index d3ba844b0b743..efd010b5383c1 100644
--- a/turborepo-tests/integration/tests/command-link.t
+++ b/turborepo-tests/integration/tests/other/command-link.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/../../helpers/mock_turbo_config.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/mock_turbo_config.sh
 
 Link Test Run
   $ ${TURBO} link --__test-run
diff --git a/turborepo-tests/integration/tests/command-login.t b/turborepo-tests/integration/tests/other/command-login.t
similarity index 65%
rename from turborepo-tests/integration/tests/command-login.t
rename to turborepo-tests/integration/tests/other/command-login.t
index 1ddfcf0eb794c..7ca517cbf76d2 100644
--- a/turborepo-tests/integration/tests/command-login.t
+++ b/turborepo-tests/integration/tests/other/command-login.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
 
 Login Test Run
   $ ${TURBO} login --__test-run
diff --git a/turborepo-tests/integration/tests/command-logout.t b/turborepo-tests/integration/tests/other/command-logout.t
similarity index 57%
rename from turborepo-tests/integration/tests/command-logout.t
rename to turborepo-tests/integration/tests/other/command-logout.t
index 902308f8d9cf2..b225ebea0b6ee 100644
--- a/turborepo-tests/integration/tests/command-logout.t
+++ b/turborepo-tests/integration/tests/other/command-logout.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/../../helpers/mock_turbo_config.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/mock_turbo_config.sh
 
 Logout while logged in
   $ ${TURBO} logout
diff --git a/turborepo-tests/integration/tests/command-ls.t b/turborepo-tests/integration/tests/other/command-ls.t
similarity index 89%
rename from turborepo-tests/integration/tests/command-ls.t
rename to turborepo-tests/integration/tests/other/command-ls.t
index ab799b7cabd89..ec37bffbf9285 100644
--- a/turborepo-tests/integration/tests/command-ls.t
+++ b/turborepo-tests/integration/tests/other/command-ls.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh --no-install
 
 Run info
   $ ${TURBO} ls
diff --git a/turborepo-tests/integration/tests/command-query.t b/turborepo-tests/integration/tests/other/command-query.t
similarity index 92%
rename from turborepo-tests/integration/tests/command-query.t
rename to turborepo-tests/integration/tests/other/command-query.t
index 2ba498b247464..786c1ac592f10 100644
--- a/turborepo-tests/integration/tests/command-query.t
+++ b/turborepo-tests/integration/tests/other/command-query.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 Write query to file
   $ echo 'query { packages { items { name } } }' > query.gql
diff --git a/turborepo-tests/integration/tests/command-telemetry.t b/turborepo-tests/integration/tests/other/command-telemetry.t
similarity index 92%
rename from turborepo-tests/integration/tests/command-telemetry.t
rename to turborepo-tests/integration/tests/other/command-telemetry.t
index 91e7460165ffe..e14d89479b732 100644
--- a/turborepo-tests/integration/tests/command-telemetry.t
+++ b/turborepo-tests/integration/tests/other/command-telemetry.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/../../helpers/mock_telemetry_config.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/mock_telemetry_config.sh
 
 Run status (with first run message)
   $ TURBO_TELEMETRY_MESSAGE_DISABLED=0 ${TURBO} telemetry status
diff --git a/turborepo-tests/integration/tests/command-unlink.t b/turborepo-tests/integration/tests/other/command-unlink.t
similarity index 66%
rename from turborepo-tests/integration/tests/command-unlink.t
rename to turborepo-tests/integration/tests/other/command-unlink.t
index 96d9516c5a817..85becde1f80e2 100644
--- a/turborepo-tests/integration/tests/command-unlink.t
+++ b/turborepo-tests/integration/tests/other/command-unlink.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
 
 Unlink Test Run
   $ ${TURBO} unlink --__test-run
diff --git a/turborepo-tests/integration/tests/command-version.t b/turborepo-tests/integration/tests/other/command-version.t
similarity index 85%
rename from turborepo-tests/integration/tests/command-version.t
rename to turborepo-tests/integration/tests/other/command-version.t
index 3860319d062b5..da9e62dde7e00 100644
--- a/turborepo-tests/integration/tests/command-version.t
+++ b/turborepo-tests/integration/tests/other/command-version.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
   $ VERSION=${MONOREPO_ROOT_DIR}/version.txt
 
 Test version matches that of version.txt
diff --git a/turborepo-tests/integration/tests/config.t b/turborepo-tests/integration/tests/other/config.t
similarity index 95%
rename from turborepo-tests/integration/tests/config.t
rename to turborepo-tests/integration/tests/other/config.t
index 2210d588edc4e..dd200cb414ef6 100644
--- a/turborepo-tests/integration/tests/config.t
+++ b/turborepo-tests/integration/tests/other/config.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh --no-install
 
 Run test run
   $ ${TURBO} config
@@ -44,7 +44,7 @@ Run test run with remote cache timeout from both env and flag (flag should take
   456
 
 Use our custom turbo config with an invalid env var
-  $ . ${TESTDIR}/../../helpers/replace_turbo_json.sh $(pwd) "invalid-env-var.json"
+  $ . ${TESTDIR}/../../../helpers/replace_turbo_json.sh $(pwd) "invalid-env-var.json"
 
 Run build with invalid env var
   $ ${TURBO} build
diff --git a/turborepo-tests/integration/tests/conflicting-flags.t b/turborepo-tests/integration/tests/other/conflicting-flags.t
similarity index 74%
rename from turborepo-tests/integration/tests/conflicting-flags.t
rename to turborepo-tests/integration/tests/other/conflicting-flags.t
index f62c847d93e57..f156402546b82 100644
--- a/turborepo-tests/integration/tests/conflicting-flags.t
+++ b/turborepo-tests/integration/tests/other/conflicting-flags.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh --no-install
   $ ${TURBO} run build --daemon --no-daemon
    ERROR  the argument '--daemon' cannot be used with '--no-daemon'
   
diff --git a/turborepo-tests/integration/tests/dry-run.t b/turborepo-tests/integration/tests/other/dry-run.t
similarity index 98%
rename from turborepo-tests/integration/tests/dry-run.t
rename to turborepo-tests/integration/tests/other/dry-run.t
index cab66919cd9dd..3a3ef8b871e03 100644
--- a/turborepo-tests/integration/tests/dry-run.t
+++ b/turborepo-tests/integration/tests/other/dry-run.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 # Run the build task with --dry flag and cut up the logs into separate files by empty lines
 # https://stackoverflow.com/a/33297878/986415
diff --git a/turborepo-tests/integration/tests/engines.t b/turborepo-tests/integration/tests/other/engines.t
similarity index 90%
rename from turborepo-tests/integration/tests/engines.t
rename to turborepo-tests/integration/tests/other/engines.t
index bee444d45cfcb..0cd34d4264be3 100644
--- a/turborepo-tests/integration/tests/engines.t
+++ b/turborepo-tests/integration/tests/other/engines.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
   $ jq '.engines = {"node": ">=12"}' package.json > package.json.new
   $ mv package.json.new package.json
 
diff --git a/turborepo-tests/integration/tests/filter-run.t b/turborepo-tests/integration/tests/other/filter-run.t
similarity index 96%
rename from turborepo-tests/integration/tests/filter-run.t
rename to turborepo-tests/integration/tests/other/filter-run.t
index 5066f610c8d75..a1d8c7c08d5e4 100644
--- a/turborepo-tests/integration/tests/filter-run.t
+++ b/turborepo-tests/integration/tests/other/filter-run.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 # Running with --filter works and exits with success
   $ ${TURBO} run build --filter="[main]"
diff --git a/turborepo-tests/integration/tests/find-correct-turbo.t b/turborepo-tests/integration/tests/other/find-correct-turbo.t
similarity index 57%
rename from turborepo-tests/integration/tests/find-correct-turbo.t
rename to turborepo-tests/integration/tests/other/find-correct-turbo.t
index 656e2a40d04c9..67553ff209bda 100644
--- a/turborepo-tests/integration/tests/find-correct-turbo.t
+++ b/turborepo-tests/integration/tests/other/find-correct-turbo.t
@@ -1,6 +1,6 @@
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
 
 Make sure exit code is 2 when no args are passed
-  $ CURR=$(${TURBO} --cwd ${TESTDIR}/../.. bin)
+  $ CURR=$(${TURBO} --cwd ${TESTDIR}/../../../ bin)
   $ diff --strip-trailing-cr <(readlink -f ${TURBO}) <(readlink -f ${CURR})
 
diff --git a/turborepo-tests/integration/tests/framework-inference.t b/turborepo-tests/integration/tests/other/framework-inference.t
similarity index 95%
rename from turborepo-tests/integration/tests/framework-inference.t
rename to turborepo-tests/integration/tests/other/framework-inference.t
index 2921929d2c19d..276de7d509fd1 100644
--- a/turborepo-tests/integration/tests/framework-inference.t
+++ b/turborepo-tests/integration/tests/other/framework-inference.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh framework_inference --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh framework_inference --no-install
 
 Prove that we start with no inferred variables
   $ ${TURBO} run build --dry=json | jq -r '.tasks[].environmentVariables.inferred'
diff --git a/turborepo-tests/integration/tests/global-deps.t b/turborepo-tests/integration/tests/other/global-deps.t
similarity index 95%
rename from turborepo-tests/integration/tests/global-deps.t
rename to turborepo-tests/integration/tests/other/global-deps.t
index ba8e1e7ed9182..7853635f14cea 100644
--- a/turborepo-tests/integration/tests/global-deps.t
+++ b/turborepo-tests/integration/tests/other/global-deps.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh global_deps
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh global_deps
 
 Run a build
   $ ${TURBO} build -F my-app --output-logs=hash-only
diff --git a/turborepo-tests/integration/tests/global-env.t b/turborepo-tests/integration/tests/other/global-env.t
similarity index 97%
rename from turborepo-tests/integration/tests/global-env.t
rename to turborepo-tests/integration/tests/other/global-env.t
index a22269cf5b2e9..88274aa1a956b 100644
--- a/turborepo-tests/integration/tests/global-env.t
+++ b/turborepo-tests/integration/tests/other/global-env.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 # Run all tests with --filter=util so we don't have any non-deterministic ordering
 
diff --git a/turborepo-tests/integration/tests/interactive.t b/turborepo-tests/integration/tests/other/interactive.t
similarity index 71%
rename from turborepo-tests/integration/tests/interactive.t
rename to turborepo-tests/integration/tests/other/interactive.t
index fea5c26e80509..16c0f683e69a0 100644
--- a/turborepo-tests/integration/tests/interactive.t
+++ b/turborepo-tests/integration/tests/other/interactive.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
-  $ . ${TESTDIR}/../../helpers/replace_turbo_json.sh $(pwd) "interactive.json"
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/replace_turbo_json.sh $(pwd) "interactive.json"
 Verify we error on interactive task that hasn't been marked as cache: false
   $ ${TURBO} build
     x Tasks cannot be marked as interactive and cacheable.
diff --git a/turborepo-tests/integration/tests/invalid-package-json.t b/turborepo-tests/integration/tests/other/invalid-package-json.t
similarity index 97%
rename from turborepo-tests/integration/tests/invalid-package-json.t
rename to turborepo-tests/integration/tests/other/invalid-package-json.t
index 416fa8d6de42c..597f1bda3981c 100644
--- a/turborepo-tests/integration/tests/invalid-package-json.t
+++ b/turborepo-tests/integration/tests/other/invalid-package-json.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh --no-install
 Clear name field
   $ jq '.name = ""' apps/my-app/package.json > package.json.new
   $ mv apps/my-app/package.json apps/my-app/package.json.old
diff --git a/turborepo-tests/integration/tests/no-args.t b/turborepo-tests/integration/tests/other/no-args.t
similarity index 98%
rename from turborepo-tests/integration/tests/no-args.t
rename to turborepo-tests/integration/tests/other/no-args.t
index f78b2cadbef97..0d1e04b5eed6c 100644
--- a/turborepo-tests/integration/tests/no-args.t
+++ b/turborepo-tests/integration/tests/other/no-args.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 Make sure exit code is 2 when no args are passed
   $ ${TURBO}
@@ -164,7 +164,7 @@ we get the full help output.
   The build system that makes ship happen
 
 Initialize a new monorepo
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh composable_config > /dev/null 2>&1
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh composable_config > /dev/null 2>&1
 
   $ ${TURBO} run
   No tasks provided, here are some potential ones
diff --git a/turborepo-tests/integration/tests/package-manager.t b/turborepo-tests/integration/tests/other/package-manager.t
similarity index 92%
rename from turborepo-tests/integration/tests/package-manager.t
rename to turborepo-tests/integration/tests/other/package-manager.t
index f7d04cd76ba65..00c610a10f216 100644
--- a/turborepo-tests/integration/tests/package-manager.t
+++ b/turborepo-tests/integration/tests/other/package-manager.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh basic_monorepo "npm@8.19.4" --no-install
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh basic_monorepo "npm@8.19.4" --no-install
 
 Run test run
   $ TURBO_LOG_VERBOSITY=off ${TURBO} config | jq .packageManager
diff --git a/turborepo-tests/integration/tests/passthrough-args.t b/turborepo-tests/integration/tests/other/passthrough-args.t
similarity index 92%
rename from turborepo-tests/integration/tests/passthrough-args.t
rename to turborepo-tests/integration/tests/other/passthrough-args.t
index 3e8d6e141925a..2d1c2d61212d9 100644
--- a/turborepo-tests/integration/tests/passthrough-args.t
+++ b/turborepo-tests/integration/tests/other/passthrough-args.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh passthrough
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh passthrough
 
   $ ${TURBO} -F my-app echo -- hello
   \xe2\x80\xa2 Packages in scope: my-app (esc)
diff --git a/turborepo-tests/integration/tests/pkg-inference.t b/turborepo-tests/integration/tests/other/pkg-inference.t
similarity index 89%
rename from turborepo-tests/integration/tests/pkg-inference.t
rename to turborepo-tests/integration/tests/other/pkg-inference.t
index 51eeadef87124..dd082ef4496e6 100644
--- a/turborepo-tests/integration/tests/pkg-inference.t
+++ b/turborepo-tests/integration/tests/other/pkg-inference.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 # Run as if called by global turbo
   $ TURBO_INVOCATION_DIR=$(pwd)/packages/util ${TURBO} build --skip-infer
diff --git a/turborepo-tests/integration/tests/recursive-turbo.t b/turborepo-tests/integration/tests/other/recursive-turbo.t
similarity index 93%
rename from turborepo-tests/integration/tests/recursive-turbo.t
rename to turborepo-tests/integration/tests/other/recursive-turbo.t
index 30be277702fd2..a4ca823c25507 100644
--- a/turborepo-tests/integration/tests/recursive-turbo.t
+++ b/turborepo-tests/integration/tests/other/recursive-turbo.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh
 
 sed replaces the square brackets with parentheses so prysk can parse the file path
   $ ${TURBO} something 2>&1 | sed  's/\[\([^]]*\)\]/\(\1)/g'
diff --git a/turborepo-tests/integration/tests/shim-errors.t b/turborepo-tests/integration/tests/other/shim-errors.t
similarity index 97%
rename from turborepo-tests/integration/tests/shim-errors.t
rename to turborepo-tests/integration/tests/other/shim-errors.t
index 669809f937565..a6d1595cb2234 100644
--- a/turborepo-tests/integration/tests/shim-errors.t
+++ b/turborepo-tests/integration/tests/other/shim-errors.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
 
 Should error if `--cwd` flag doesn't have path passed along with it
   $ ${TURBO} foo bar --cwd
diff --git a/turborepo-tests/integration/tests/turbo-help.t b/turborepo-tests/integration/tests/other/turbo-help.t
similarity index 99%
rename from turborepo-tests/integration/tests/turbo-help.t
rename to turborepo-tests/integration/tests/other/turbo-help.t
index 39663df7de4f9..663a6f64c002b 100644
--- a/turborepo-tests/integration/tests/turbo-help.t
+++ b/turborepo-tests/integration/tests/other/turbo-help.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
+  $ . ${TESTDIR}/../../../helpers/setup.sh
 
 Test help flag
   $ ${TURBO} -h
diff --git a/turborepo-tests/integration/tests/turbo-trace.t b/turborepo-tests/integration/tests/other/turbo-trace.t
similarity index 99%
rename from turborepo-tests/integration/tests/turbo-trace.t
rename to turborepo-tests/integration/tests/other/turbo-trace.t
index cb6f7e33e4812..d696d41134095 100644
--- a/turborepo-tests/integration/tests/turbo-trace.t
+++ b/turborepo-tests/integration/tests/other/turbo-trace.t
@@ -1,5 +1,5 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup_integration_test.sh turbo_trace
+  $ . ${TESTDIR}/../../../helpers/setup_integration_test.sh turbo_trace
 
   $ ${TURBO} query "query { file(path: \"main.ts\") { path } }"
    WARNING  query command is experimental and may change in the future