diff --git a/.buildkite/daily.yml b/.buildkite/daily.yml
index a9018f27bca..4f21fd29f57 100644
--- a/.buildkite/daily.yml
+++ b/.buildkite/daily.yml
@@ -27,6 +27,16 @@ steps:
       - junit-annotate#v1.7.0:
           artifacts: twister-*.xml
 
+  - command: |
+      buildkite-agent artifact download twister-*.xml .
+      junitparser merge twister-*.xml junit.xml
+      buildkite-agent artifact upload junit.xml
+      junit2html junit.xml
+      buildkite-agent artifact upload junit.xml.html
+      cat << EOF | buildkite-agent annotate --style "info"
+        Read the <a href="artifact://junit.xml.html">JUnit test report</a>
+      EOF
+
 notify:
   - email: "builds+int+399+7809482394022958124@lists.zephyrproject.org"
     if: build.state != "passed"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f1bf1eaf112..9f06e7daf47 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,3 +26,13 @@ steps:
   - plugins:
       - junit-annotate#v1.7.0:
           artifacts: twister-*.xml
+
+  - command: |
+      buildkite-agent artifact download twister-*.xml .
+      junitparser merge twister-*.xml junit.xml
+      buildkite-agent artifact upload junit.xml
+      junit2html junit.xml
+      buildkite-agent artifact upload junit.xml.html
+      cat << EOF | buildkite-agent annotate --style "info"
+        Read the <a href="artifact://junit.xml.html">JUnit test report</a>
+      EOF