diff --git a/packages/playground/package.json b/packages/playground/package.json
index a384310433..d8053f9db8 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -3,9 +3,9 @@
   "name": "playground",
   "type": "commonjs",
   "scripts": {
-    "clean": "rescript legacy clean",
+    "clean": "rescript clean",
     "test": "node ./playground_test.cjs",
-    "build": "rescript legacy clean && rescript legacy build && node scripts/generate_cmijs.mjs && rollup -c",
+    "build": "rescript clean && rescript legacy build && node scripts/generate_cmijs.mjs && rollup -c",
     "upload-bundle": "node scripts/upload_bundle.mjs"
   },
   "dependencies": {
diff --git a/packages/playground/scripts/generate_cmijs.mjs b/packages/playground/scripts/generate_cmijs.mjs
index 3a6e2db33a..a89b899f32 100644
--- a/packages/playground/scripts/generate_cmijs.mjs
+++ b/packages/playground/scripts/generate_cmijs.mjs
@@ -23,7 +23,7 @@ import {
   playgroundPackagesDir,
 } from "./common.mjs";
 
-exec("yarn rescript legacy clean");
+exec("yarn rescript clean");
 exec("yarn rescript legacy");
 
 // We need to build the compiler's builtin modules as a separate cmij.
diff --git a/rescript.json b/rescript.json
new file mode 100644
index 0000000000..0935d87399
--- /dev/null
+++ b/rescript.json
@@ -0,0 +1,6 @@
+{
+    "name": "rescript",
+    "bs-dependencies": [
+        "@tests/gentype-react-example"
+    ]
+}
\ No newline at end of file
diff --git a/rewatch/testrepo/package.json b/rewatch/testrepo/package.json
index a170d39c59..1b87224273 100644
--- a/rewatch/testrepo/package.json
+++ b/rewatch/testrepo/package.json
@@ -22,6 +22,6 @@
     "watch": "../target/release/rewatch watch .",
     "watch:rescript": "rescript legacy watch",
     "clean": "../target/release/rewatch clean .",
-    "clean:rescript": "rescript legacy clean"
+    "clean:rescript": "rescript clean"
   }
 }
diff --git a/scripts/res/package.json b/scripts/res/package.json
index 1168ebeb80..cbef5e568b 100644
--- a/scripts/res/package.json
+++ b/scripts/res/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean",
+    "clean": "rescript clean",
     "dev": "rescript legacy -w",
     "apidocs:generate": "yarn build && node GenApiDocs.res.js"
   },
diff --git a/tests/analysis_tests/tests-generic-jsx-transform/package.json b/tests/analysis_tests/tests-generic-jsx-transform/package.json
index 7a4f4861f8..fd016eeb9e 100644
--- a/tests/analysis_tests/tests-generic-jsx-transform/package.json
+++ b/tests/analysis_tests/tests-generic-jsx-transform/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean"
+    "clean": "rescript clean"
   },
   "dependencies": {
     "rescript": "workspace:^"
diff --git a/tests/analysis_tests/tests-incremental-typechecking/package.json b/tests/analysis_tests/tests-incremental-typechecking/package.json
index cd410d8afa..559bffd744 100644
--- a/tests/analysis_tests/tests-incremental-typechecking/package.json
+++ b/tests/analysis_tests/tests-incremental-typechecking/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean"
+    "clean": "rescript clean"
   },
   "dependencies": {
     "rescript": "workspace:^"
diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/package.json b/tests/analysis_tests/tests-reanalyze/deadcode/package.json
index c9ff3996f7..a73dcaf9bc 100644
--- a/tests/analysis_tests/tests-reanalyze/deadcode/package.json
+++ b/tests/analysis_tests/tests-reanalyze/deadcode/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean"
+    "clean": "rescript clean"
   },
   "dependencies": {
     "@rescript/react": "link:../../../dependencies/rescript-react",
diff --git a/tests/analysis_tests/tests-reanalyze/termination/package.json b/tests/analysis_tests/tests-reanalyze/termination/package.json
index 02b2adf3e5..06c0593f42 100644
--- a/tests/analysis_tests/tests-reanalyze/termination/package.json
+++ b/tests/analysis_tests/tests-reanalyze/termination/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean"
+    "clean": "rescript clean"
   },
   "dependencies": {
     "rescript": "workspace:^"
diff --git a/tests/analysis_tests/tests/package.json b/tests/analysis_tests/tests/package.json
index 01bbe0ecbb..601884c23c 100644
--- a/tests/analysis_tests/tests/package.json
+++ b/tests/analysis_tests/tests/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean"
+    "clean": "rescript clean"
   },
   "dependencies": {
     "@rescript/react": "link:../../dependencies/rescript-react",
diff --git a/tests/docstring_tests/package.json b/tests/docstring_tests/package.json
index 1cedbd5360..c7858c0599 100644
--- a/tests/docstring_tests/package.json
+++ b/tests/docstring_tests/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean",
+    "clean": "rescript clean",
     "dev": "rescript -w"
   },
   "dependencies": {
diff --git a/tests/gentype_tests/typescript-react-example/package.json b/tests/gentype_tests/typescript-react-example/package.json
index b72e3819ed..f8e88d4316 100644
--- a/tests/gentype_tests/typescript-react-example/package.json
+++ b/tests/gentype_tests/typescript-react-example/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "start": "rescript legacy build -w",
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean",
+    "clean": "rescript clean",
     "typecheck": "tsc",
     "check": "biome check --changed --no-errors-on-unmatched ."
   },
diff --git a/tests/gentype_tests/typescript-react-example/rescript.json b/tests/gentype_tests/typescript-react-example/rescript.json
index ff2951419f..60f5f49259 100644
--- a/tests/gentype_tests/typescript-react-example/rescript.json
+++ b/tests/gentype_tests/typescript-react-example/rescript.json
@@ -15,7 +15,7 @@
     },
     "exportInterfaces": false
   },
-  "name": "sample-typescript-app",
+  "name": "@tests/gentype-react-example",
   "bsc-flags": [],
   "jsx": { "version": 4 },
   "bs-dependencies": ["@rescript/react"],
diff --git a/tests/tools_tests/package.json b/tests/tools_tests/package.json
index 01d0070301..2bf38e72e8 100644
--- a/tests/tools_tests/package.json
+++ b/tests/tools_tests/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "rescript legacy build",
-    "clean": "rescript legacy clean",
+    "clean": "rescript clean",
     "dev": "rescript -w"
   },
   "dependencies": {