diff --git a/Jenkinsfile b/Jenkinsfile
index 2913ec7406..8b87983f43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -118,10 +118,12 @@ axes.values().combinations {
               }
               mavenOptions.add(0, "-Dsurefire.excludesFile=${excludesFile}")
             }
-            realtimeJUnit(healthScaleFactor: 20.0, testResults: '*/target/surefire-reports/*.xml') {
-              infra.runMaven(mavenOptions, jdk)
-              if (isUnix()) {
-                sh 'git add . && git diff --exit-code HEAD'
+            withChecks(name: 'Tests', includeStage: true) {
+              realtimeJUnit(healthScaleFactor: 20.0, testResults: '*/target/surefire-reports/*.xml') {
+                infra.runMaven(mavenOptions, jdk)
+                if (isUnix()) {
+                  sh 'git add . && git diff --exit-code HEAD'
+                }
               }
             }
           }
@@ -219,10 +221,13 @@ athAxes.values().combinations {
         // Just to be safe
         deleteDir()
         checkout scm
-        infra.withArtifactCachingProxy {
-          sh "bash ath.sh ${jdk} ${browser}"
+
+        withChecks(name: 'Tests', includeStage: true) {
+          infra.withArtifactCachingProxy {
+            sh "bash ath.sh ${jdk} ${browser}"
+          }
+          junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
         }
-        junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
         /*
          * Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
          * which expects this to be a full build. When we implement subsetting, this can be re-enabled using