diff --git a/run-tests.bat b/run-tests.bat
index 207efed2..7e792bbd 100644
--- a/run-tests.bat
+++ b/run-tests.bat
@@ -28,18 +28,23 @@ nvm use 8.5.0
 
 call npm install || goto :error
 
+SET JUNIT_REPORT_STACK=1
+SET FAILED=0
+
 for %%v in (4.8.4 6.11.3 7.9.0 8.5.0) do (
   nvm install %%v
   nvm use %%v
   node -e "console.log(process.versions)"
 
-  call .\node_modules\.bin\gulp clean.all || goto :error
-  call .\node_modules\.bin\gulp setup.windows || goto :error
-  call .\node_modules\.bin\gulp native.test || goto :error
+  SET JUNIT_REPORT_PATH=reports/node%%v/
+
+  call .\node_modules\.bin\gulp clean.all || SET FAILED=1
+  call .\node_modules\.bin\gulp setup.windows || SET FAILED=1
+  call .\node_modules\.bin\gulp native.test || SET FAILED=1
 )
 
-if %errorlevel% neq 0 exit /b %errorlevel%
-
+if %FAILED% neq 0 exit /b 1
+node merge_kokoro_logs.js
 goto :EOF
 
 :error