diff --git a/zorg/jenkins/jobs/jobs/clang-san-iossim b/zorg/jenkins/jobs/jobs/clang-san-iossim
index 2e62d857c..ab08aedce 100644
--- a/zorg/jenkins/jobs/jobs/clang-san-iossim
+++ b/zorg/jenkins/jobs/jobs/clang-san-iossim
@@ -109,7 +109,10 @@ pipeline {
             post {
                 always {
                     script {
-                        junit 'clang-build/**/testresults-*.xunit.xml'
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: "clang-build/**/testresults-*.xunit.xml"
+                        ])
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA b/zorg/jenkins/jobs/jobs/clang-stage1-RA
index 21aeb4b68..3e76b25c3 100644
--- a/zorg/jenkins/jobs/jobs/clang-stage1-RA
+++ b/zorg/jenkins/jobs/jobs/clang-stage1-RA
@@ -114,7 +114,10 @@ pipeline {
             post {
                 always {
                     script {
-                        junit "clang-build/**/testresults.xunit.xml"
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: "clang-build/**/testresults.xunit.xml"
+                        ])
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA-as b/zorg/jenkins/jobs/jobs/clang-stage1-RA-as
index 82f96d87a..169ab41bd 100644
--- a/zorg/jenkins/jobs/jobs/clang-stage1-RA-as
+++ b/zorg/jenkins/jobs/jobs/clang-stage1-RA-as
@@ -113,7 +113,10 @@ pipeline {
             post {
                 always {
                     script {
-                        junit "clang-build/**/testresults.xunit.xml"
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: "clang-build/**/testresults.xunit.xml"
+                        ])
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive b/zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive
index eeb65fc46..9a1ad5eaf 100644
--- a/zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive
+++ b/zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive
@@ -108,12 +108,12 @@ pipeline {
                // ToDo: Restore the issue scanner
                // scanForIssues tool: clang()
 
-                junit allowEmptyResults: true, testResults: "clang-build/**/testresults.xunit.xml"
-                junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimX86_64Config.xunit.xml"
-                junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimI386Config.xunit.xml"
-                junit allowEmptyResults: true, testResults: "clang-build/tsan-IOSSimX86_64Config.xunit.xml"
-
-                sh "rm -rf clang-build clang-install host-compiler *.tar.gz"
+               def Junit = new org.swift.Junit()
+               Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/**/testresults.xunit.xml"])
+               Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/asan-IOSSimX86_64Config.xunit.xml"])
+               Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/asan-IOSSimI386Config.xunit.xml"])
+               Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/tsan-IOSSimX86_64Config.xunit.xml"])
+               sh "rm -rf clang-build clang-install host-compiler *.tar.gz"
             }
         }
     }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental b/zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental
index e0f247371..7c5152199 100644
--- a/zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental
+++ b/zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental
@@ -106,7 +106,10 @@ pipeline {
             post {
                 always {
                     script {
-                        junit "clang-build/**/testresults.xunit.xml"
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: "clang-build/**/testresults.xunit.xml"
+                        ])
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto b/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
index c24e5b3e5..d1bba10f8 100644
--- a/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
+++ b/zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
@@ -129,7 +129,10 @@ pipeline {
             post {
                 always {
                     script {
-                        junit "clang-build/**/testresults.xunit.xml"
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: "clang-build/**/testresults.xunit.xml"
+                        ])
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan
index d6b356c34..6beccbb5c 100644
--- a/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan
+++ b/zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan
@@ -126,7 +126,10 @@ pipeline {
             post {
                 always {
                     script {
-                        junit "clang-build/**/testresults.xunit.xml"
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: "clang-build/**/testresults.xunit.xml"
+                        ])
                     }
                 }
             }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-as b/zorg/jenkins/jobs/jobs/lldb-cmake-as
index 68732c17b..fb4168285 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-as
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-as
@@ -201,7 +201,12 @@ pipeline {
         always {
             // ToDo: Restore the issue scanner
             // scanForIssues tool: clang()
-            junit 'test/results.xml'
+            script {
+                def Junit = new org.swift.Junit()
+                Junit.safeJunit([
+                    testResults: 'test/results.xml'
+                ])
+            }
         }
     }
 }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-intel b/zorg/jenkins/jobs/jobs/lldb-cmake-intel
index 29cfd3f39..c9e5c8856 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-intel
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-intel
@@ -214,7 +214,12 @@ pipeline {
         always {
             // ToDo: Restore the issue scanner
             // scanForIssues tool: clang()
-            junit 'test/results.xml'
+            script {
+                def Junit = new org.swift.Junit()
+                Junit.safeJunit([
+                    testResults: 'test/results.xml'
+                ])
+            }
         }
     }
 }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
index 68e25482d..b8d3c3eb3 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
@@ -143,7 +143,12 @@ pipeline {
                     python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
                     '''
                 }
-                junit 'test/results.xml'
+                script {
+                    def Junit = new org.swift.Junit()
+                    Junit.safeJunit([
+                        testResults: 'test/results.xml'
+                    ])
+                }
             }
         }
         stage('Test DWARF4') {
@@ -174,7 +179,12 @@ pipeline {
                     python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
                     '''
                 }
-                junit 'test/results.xml'
+                script {
+                    def Junit = new org.swift.Junit()
+                    Junit.safeJunit([
+                        testResults: 'test/results.xml'
+                    ])
+                }
             }
         }
         stage('Test DWARF5') {
@@ -205,7 +215,12 @@ pipeline {
                     python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
                     '''
                 }
-                junit 'test/results.xml'
+                script {
+                def Junit = new org.swift.Junit()
+                Junit.safeJunit([
+                    testResults: 'test/results.xml'
+                ])
+            }
             }
         }
         stage('Build Clang 15.0.1') {
@@ -272,7 +287,12 @@ pipeline {
                     python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
                     '''
                 }
-                junit 'test/results.xml'
+                script {
+                def Junit = new org.swift.Junit()
+                Junit.safeJunit([
+                    testResults: 'test/results.xml'
+                ])
+            }
             }
         }
         stage('Build Clang 17.0.6') {
@@ -340,8 +360,13 @@ pipeline {
                     sleep 120
                     python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
                     '''
+                    script {
+                        def Junit = new org.swift.Junit()
+                        Junit.safeJunit([
+                            testResults: 'test/results.xml'
+                        ])
+                    }
                 }
-                junit 'test/results.xml'
             }
         }
     }
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
index ec453e3f2..33333c658 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
@@ -153,7 +153,12 @@ pipeline {
         always {
             // ToDo: Restore issue scanner
             // scanForIssues tool: clang()
-            junit 'test/results.xml'
+            script {
+                def Junit = new org.swift.Junit()
+                Junit.safeJunit([
+                    testResults: 'test/results.xml'
+                ])
+            }
         }
     }
 }
diff --git a/zorg/jenkins/jobs/jobs/llvm-coverage b/zorg/jenkins/jobs/jobs/llvm-coverage
index d1914db5a..594b5d435 100755
--- a/zorg/jenkins/jobs/jobs/llvm-coverage
+++ b/zorg/jenkins/jobs/jobs/llvm-coverage
@@ -201,7 +201,12 @@ pipeline {
         always {
             // ToDo: Restore issue scanner
             //scanForIssues tool: clang()
-            junit 'test/results.xml'
+            script {
+                def Junit = new org.swift.Junit()
+                Junit.safeJunit([
+                    testResults: 'test/results.xml'
+                ])
+            }
         }
         success {
             script {