diff --git a/run-tests.bat b/run-tests.bat
index bd9a83a9..6359dde0 100644
--- a/run-tests.bat
+++ b/run-tests.bat
@@ -29,19 +29,25 @@ 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
-  npm install -g npm
+  call npm install -g npm
   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
+  mkdir reports\node%%v
+  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%
-
+node merge_kokoro_logs.js
+if %FAILED% neq 0 exit /b 1
 goto :EOF
 
 :error
diff --git a/test/kokoro/windows.cfg b/test/kokoro/windows.cfg
index 2b9d0906..c440966f 100644
--- a/test/kokoro/windows.cfg
+++ b/test/kokoro/windows.cfg
@@ -17,3 +17,8 @@
 # Location of the continuous shell script in repository.
 build_file: "grpc-node/test/kokoro.bat"
 timeout_mins: 60
+action {
+  define_artifacts {
+    regex: "github/grpc-node/reports/**/sponge_log.xml"
+  }
+}