diff --git a/.github/workflows/hardhat-tests.yml b/.github/workflows/hardhat-tests.yml
index fc7ec183c..5ece4e182 100644
--- a/.github/workflows/hardhat-tests.yml
+++ b/.github/workflows/hardhat-tests.yml
@@ -65,7 +65,7 @@ jobs:
           DO_NOT_SET_THIS_ENV_VAR____IS_HARDHAT_CI: true
           FORCE_COLOR: 3
           NODE_OPTIONS: --max-old-space-size=4096
-        run: cd hardhat-tests && pnpm test
+        run: cd hardhat-tests && pnpm test:ci
   lint-hardhat-tests:
     name: Lint Hardhat tests
     runs-on: ubuntu-latest
diff --git a/hardhat-tests/package.json b/hardhat-tests/package.json
index 3e044842b..6cb9d3012 100644
--- a/hardhat-tests/package.json
+++ b/hardhat-tests/package.json
@@ -10,9 +10,12 @@
     "lint:fix": "pnpm prettier --write && pnpm eslint --fix",
     "eslint": "eslint 'test/**/*.ts'",
     "prettier": "prettier \"**/*.{js,md,json}\"",
-    "pretest": "cd ../crates/edr_napi && pnpm build",
-    "test": "mocha --recursive \"test/**/*.ts\" && ./run-integration-tests.sh",
+    "pretest": "pnpm build:edr",
+    "test": "mocha --recursive \"test/**/*.ts\"",
+    "test:integration": "./run-integration-tests.sh",
+    "test:ci": "pnpm test && pnpm test:integration",
     "build": "tsc --build --force --incremental .",
+    "build:edr": "cd ../crates/edr_napi && pnpm build",
     "clean": "rimraf build-test tsconfig.tsbuildinfo test/internal/hardhat-network/provider/.hardhat_node_test_cache test/internal/hardhat-network/stack-traces/test-files/artifacts"
   },
   "devDependencies": {
diff --git a/hardhat-tests/run-integration-tests.sh b/hardhat-tests/run-integration-tests.sh
index 44c5e7deb..11c1a3202 100755
--- a/hardhat-tests/run-integration-tests.sh
+++ b/hardhat-tests/run-integration-tests.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+pnpm build:edr
+
 cd integration
 for i in *; do
   if [ -d "$i" ]; then