diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7a13d84a2..9fc51d4f2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -34,7 +34,7 @@ jobs:
       if: ${{ matrix.node-version == '15.x' }}
       run: npm install -g npm@6
     - name: Install libclang
-      uses: KyleMayes/install-llvm-action@01144dc
+      uses: KyleMayes/install-llvm-action@01144dc97b1e2693196c3056414a44f15180648b
       with:
         version: "10"
         directory: ${{ runner.temp }}/llvm
diff --git a/test/electron/Cargo.toml b/test/electron/Cargo.toml
index 383285e68..c75ef4d17 100644
--- a/test/electron/Cargo.toml
+++ b/test/electron/Cargo.toml
@@ -4,15 +4,10 @@ version = "0.1.0"
 edition = "2018"
 authors = ["The Neon Community"]
 license = "MIT/Apache-2.0"
-build = "build.rs"
 
 [lib]
-name = "electron_tests"
 crate-type = ["cdylib"]
 
-[build-dependencies]
-neon-build = {version = "*", path = "../../crates/neon-build"}
-
 [dependencies.neon]
 version = "*"
 path = "../.."
diff --git a/test/electron/build.rs b/test/electron/build.rs
deleted file mode 100644
index b3e5729ec..000000000
--- a/test/electron/build.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    neon_build::setup();
-}
diff --git a/test/electron/package-lock.json b/test/electron/package-lock.json
index 3d2045405..0edb47dda 100644
--- a/test/electron/package-lock.json
+++ b/test/electron/package-lock.json
@@ -490,6 +490,12 @@
         }
       }
     },
+    "cargo-cp-artifact": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cargo-cp-artifact/-/cargo-cp-artifact-0.1.0.tgz",
+      "integrity": "sha512-29+tOXvPWghDESqMZMFGIEtmNCn1lbkLyUPIBLXs0qO4eYFcVnN73t4hqQ9Btye4aUQjabZQQPsUtxHE6AqzUg==",
+      "dev": true
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
diff --git a/test/electron/package.json b/test/electron/package.json
index ad9393a47..ef288acda 100644
--- a/test/electron/package.json
+++ b/test/electron/package.json
@@ -6,12 +6,13 @@
   "author": "The Neon Community",
   "license": "MIT",
   "scripts": {
-    "install": "cargo build -p electron-tests --release",
+    "install": "cargo-cp-artifact -nc index.node -- cargo build --message-format=json-render-diagnostics",
     "start": "electron .",
     "test": "node test"
   },
   "repository": "https://github.com/electron/electron-quick-start",
   "devDependencies": {
+    "cargo-cp-artifact": "^0.1.0 ",
     "electron": "^11.0.3",
     "spectron": "^13.0.0"
   }
diff --git a/test/napi/Cargo.toml b/test/napi/Cargo.toml
index 2f6edea26..0981e244d 100644
--- a/test/napi/Cargo.toml
+++ b/test/napi/Cargo.toml
@@ -1,19 +1,14 @@
 [package]
-name = "napi"
+name = "napi-tests"
 version = "0.1.0"
 authors = ["The Neon Community <david.herman@gmail.com>"]
 license = "MIT"
-build = "build.rs"
 exclude = ["artifacts.json", "index.node"]
 edition = "2018"
 
 [lib]
-name = "napi"
 crate-type = ["cdylib"]
 
-[build-dependencies]
-neon-build = {version = "*", path = "../../crates/neon-build"}
-
 [dependencies.neon]
 version = "*"
 path = "../.."
diff --git a/test/napi/build.rs b/test/napi/build.rs
deleted file mode 100644
index 687a66194..000000000
--- a/test/napi/build.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-extern crate neon_build;
-
-fn main() {
-    neon_build::setup(); // must be called in build.rs
-
-    // add project-specific build logic here...
-}
diff --git a/test/napi/package-lock.json b/test/napi/package-lock.json
index 3d4429c32..1965caacf 100644
--- a/test/napi/package-lock.json
+++ b/test/napi/package-lock.json
@@ -99,6 +99,12 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "cargo-cp-artifact": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cargo-cp-artifact/-/cargo-cp-artifact-0.1.0.tgz",
+      "integrity": "sha512-29+tOXvPWghDESqMZMFGIEtmNCn1lbkLyUPIBLXs0qO4eYFcVnN73t4hqQ9Btye4aUQjabZQQPsUtxHE6AqzUg==",
+      "dev": true
+    },
     "chai": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
diff --git a/test/napi/package.json b/test/napi/package.json
index 27188b2f1..bee60c103 100644
--- a/test/napi/package.json
+++ b/test/napi/package.json
@@ -5,10 +5,11 @@
   "author": "The Neon Community",
   "license": "MIT",
   "scripts": {
-    "install": "cargo build -p napi --release",
+    "install": "cargo-cp-artifact -nc index.node -- cargo build --message-format=json-render-diagnostics",
     "test": "mocha --expose-gc --timeout 5000 --recursive lib"
   },
   "devDependencies": {
+    "cargo-cp-artifact": "^0.1.0",
     "chai": "^4.2.0",
     "mocha": "^8.1.0"
   }