diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index d0d10ecc28..a779d8b77b 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -478,15 +478,23 @@ def generateStepForWindows(Map params = [:]){
             '''
             bat 'npm install'
             bat 'node test/test.js'
+            stash includes: '**/*-output.tap', name: 'windows-tap', useDefaultExcludes: true
           }
         } catch(e){
           error(e.toString())
-        } finally {
-          echo 'JUnit archiving no yet in place'
         }
       }
     }
 
+    // Let's now prepare the test output
+    dir('windows') {
+      unstash 'windows-tap'
+      docker.image('node:12').inside("-v ${WORKSPACE}/${BASE_DIR}/windows:/app"){
+        sh(label: "Convert Test results to JUnit format", script: 'cd /app && .ci/scripts/convert_tap_to_junit.sh')
+      }
+      junit(allowEmptyResults: true, keepLongStdio: true, testResults: '**/junit-*.xml')
+    }
+
     // If the above execution failed, then it will not reach this section. TBD
     sh label: 'Stop services', script: ".ci/scripts/windows/stop-test.sh ${version}"
   }