diff --git a/package.json b/package.json
index f356e178..3b5f9733 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
   "scripts": {
     "build": "wireit",
     "clean": "wireit",
+    "clean:yarn": "wireit",
     "dependencies:reinstall": "yarn install",
     "dependencies:upgrade": "shx rm -rf yarn.lock ; shx touch yarn.lock ; yarn-upgrade-all ; yarn-audit-fix",
     "increment:apiversion": "bash ./tooling/incrementApiVersion.sh",
@@ -52,7 +53,7 @@
     "lint:dependencies": "wireit",
     "lint:fs": "wireit",
     "test": "wireit",
-    "test:build": "yarn clean ; shx rm -rf .yarn/cache node_modules ; yarn && yarn pack && yarn test",
+    "test:build": "wireit",
     "test:mutation": "wireit",
     "test:nut": "wireit",
     "test:perf": "wireit",
@@ -85,6 +86,13 @@
         "perf-result.txt"
       ]
     },
+    "clean:yarn": {
+      "command": "shx rm -rf .yarn/cache node_modules",
+      "files": [
+        ".yarn/cache/*",
+        "node_modules/*"
+      ]
+    },
     "compile": {
       "command": "tsc -p . --incremental",
       "files": [
@@ -143,6 +151,13 @@
         "test:nut"
       ]
     },
+    "test:build": {
+      "command": "yarn && yarn pack && yarn test",
+      "dependencies": [
+        "clean",
+        "clean:yarn"
+      ]
+    },
     "test:perf": {
       "command": "node __tests__/perf/bench.mjs > perf-result.txt && shx cat perf-result.txt",
       "files": [