diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 2ba79bc6..269444e2 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -1229,12 +1229,26 @@ def ost_build_report(dev, dev_type):
 
   # Combined result
   if dev_type == 'CPU' or len(dev.tests) == NUM_DISK_TESTS:
+    # Build list of failed tests (if any)
+    failed_tests = [name for name, test in dev.tests.items() if test.failed]
+    failed_tests = [name.replace('Disk ', '') for name in failed_tests]
+    if len(failed_tests) > 2:
+      failed_tests = f'{", ".join(failed_tests[:-1])}, & {failed_tests[-1]}'
+    else:
+      failed_tests = ' & '.join(failed_tests)
+
+    # Get overall result
     result = 'UNKNOWN'
     if dev.any_test_failed():
       result = 'FAILED'
     elif dev.all_tests_passed():
       result = 'PASSED'
-    report.append(f'{dev_type} hardware diagnostic tests: {result}')
+
+    # Add to report
+    report.append(
+      f'{dev_type} hardware diagnostic tests: {result}'
+      f'{" ("+failed_tests+")" if failed_tests else ""}'
+      )
     report.append('')
 
   # Description