diff --git a/run-tests.bat b/run-tests.bat
index bbb8e211..65b8080e 100644
--- a/run-tests.bat
+++ b/run-tests.bat
@@ -46,8 +46,6 @@ for %%v in (20 22) do (
   if "%%v"=="4" (
     call npm install -g npm@5
   )
-  @rem https://github.com/mapbox/node-pre-gyp/issues/362
-  call npm install -g node-gyp
   node -e "console.log(process.versions)"
 
   mkdir reports\node%%v
diff --git a/run-tests.sh b/run-tests.sh
index b72b8b41..40957a86 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -63,9 +63,6 @@ do
 
   export JUNIT_REPORT_PATH="reports/node$version/"
 
-  # https://github.com/mapbox/node-pre-gyp/issues/362
-  npm install -g node-gyp
-
   mkdir -p "reports/node$version"
 
   node -e 'process.exit(process.version.startsWith("v'$version'") ? 0 : -1)'
@@ -80,7 +77,7 @@ do
 done
 
 set +ex
-nvm use 8
+nvm use 22
 set -ex
 
 node merge_kokoro_logs.js