diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5baf0c244d..d30d3eec8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,26 +40,24 @@ jobs:
       os: ${{ matrix.os }}
       useCache: false
       preSwapCommands: 'npx yarn-deduplicate; yarn install'
-      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/sf-plugins-core/node_modules/@salesforce/core'
+      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/sf-plugins-core/node_modules/@salesforce/core node_modules/@salesforce/cli-plugins-testkit/node_modules/@salesforce/core'
     secrets: inherit
   # hidden until we fix source-testkit to better handle jwt
-  # deployRetrieveNuts:
-  #   needs: unit-tests
-  #   uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       os: ['windows-latest-16x', 'ubuntu-latest-16x']
-  #       command:
-  #         - yarn test:nuts:deploy:metadata:manifest
-  #         - yarn test:nuts:deploy:metadata:metadata
-  #         - yarn test:nuts:deploy:metadata:source-dir
-  #         - yarn test:nuts:deploy:metadata:test-level
-  #         - yarn test:nuts:static
-  #   with:
-  #     packageName: '@salesforce/core'
-  #     externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-deploy-retrieve'
-  # preSwapCommands: 'yarn upgrade jsforce@beta; npx yarn-deduplicate; yarn install'
-  #     command: ${{ matrix.command }}
-  #     os: ${{ matrix.os }}
-  #   secrets: inherit
+  deployRetrieveNuts:
+    needs: linux-unit-tests
+    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['ubuntu-latest']
+        command:
+          - 'yarn test:nuts:tracking'
+    with:
+      packageName: '@salesforce/core'
+      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-deploy-retrieve'
+      preSwapCommands: 'npx yarn-deduplicate; yarn install'
+      command: ${{ matrix.command }}
+      os: ${{ matrix.os }}
+      preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/sf-plugins-core/node_modules/@salesforce/core node_modules/@salesforce/source-deploy-retrieve/node_modules/@salesforce/core node_modules/@salesforce/source-tracking/node_modules/@salesforce/core node_modules/@salesforce/cli-plugins-testkit/node_modules/@salesforce/core node_modules/@salesforce/source-testkit/node_modules/@salesforce/core'
+    secrets:
+      TESTKIT_AUTH_URL: ${{ secrets.TESTKIT_AUTH_URL }}