diff --git a/run-tests.bat b/run-tests.bat
index 3f3aa4f1..5aeaa700 100644
--- a/run-tests.bat
+++ b/run-tests.bat
@@ -29,15 +29,19 @@ SET JOBS=8
 call nvm version
 
 call nvm install 8
+call nvm use 8
 
 call npm install || goto :error
 
 SET JUNIT_REPORT_STACK=1
 SET FAILED=0
 
-for %%v in (4 6 7 8) do (
+for %%v in (4 6 7 8 9) do (
   call nvm install %%v
+  call nvm use %%v
   call npm install -g npm
+  @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 1444158b..bfc0ff71 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -26,7 +26,7 @@ set -ex
 cd $ROOT
 
 if [ ! -n "$node_versions" ] ; then
-  node_versions="4 5 6 7 8"
+  node_versions="4 5 6 7 8 9"
 fi
 
 set +ex
@@ -51,6 +51,9 @@ do
   nvm use $version
   set -ex
 
+  # 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)'
diff --git a/tools/release/kokoro.bat b/tools/release/kokoro.bat
index 2726d338..1fde63b5 100644
--- a/tools/release/kokoro.bat
+++ b/tools/release/kokoro.bat
@@ -14,6 +14,9 @@
 
 @echo "Starting Windows build"
 
+@rem https://github.com/mapbox/node-pre-gyp/issues/362
+call npm install -g node-gyp
+
 cd /d %~dp0
 cd ..\..
 
diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh
index e5b578f7..b89504a9 100755
--- a/tools/release/kokoro.sh
+++ b/tools/release/kokoro.sh
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# https://github.com/mapbox/node-pre-gyp/issues/362
+npm install -g node-gyp
+
 set -ex
 cd $(dirname $0)/../..
 base_dir=$(pwd)