diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 7647b56d..d0b8b476 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -543,7 +543,8 @@ def post_drive_results(ticket_number):
 
         # NVMe/SMART Attributes
         if dev.get('NVMe Disk', False):
-            report.append('NVMe Attributes:')
+            report.append('NVMe Attributes ({}):'.format(
+                TESTS['NVMe/SMART']['Status'][name]))
             for attrib in sorted(ATTRIBUTES['NVMe'].keys()):
                 if attrib in dev['nvme-cli']:
                     report.append('{attrib:30}{value}'.format(
@@ -553,7 +554,8 @@ def post_drive_results(ticket_number):
                     report[-1] = report[-1].strip().replace(' ', '.')
                     report[-1] = report[-1].replace('_', ' ')
         elif dev['smartctl'].get('ata_smart_attributes', None):
-            report.append('SMART Attributes:')
+            report.append('SMART Attributes ({}):'.format(
+                TESTS['NVMe/SMART']['Status'][name]))
             s_table = dev['smartctl'].get('ata_smart_attributes', {}).get(
                 'table', {})
             s_table = {a.get('id', 'Unknown'): a for a in s_table}
@@ -577,7 +579,8 @@ def post_drive_results(ticket_number):
         # badblocks
         bb_status = TESTS['badblocks']['Status'].get(name, None)
         if TESTS['badblocks']['Enabled'] and bb_status not in ['Denied', 'Skipped']:
-            report.append('badblocks:')
+            report.append('badblocks ({}):'.format(
+                TESTS['badblocks']['Status'][name]))
             bb_result = TESTS['badblocks']['Results'].get(
                 name,
                 'ERROR: Failed to read log.')
@@ -602,7 +605,8 @@ def post_drive_results(ticket_number):
                 oneline=True)
             for c in COLORS.values():
                 one_line_graph = one_line_graph.replace(c, '')
-            report.append('I/O Benchmark:')
+            report.append('I/O Benchmark ({}):'.format(
+                TESTS['iobenchmark']['Status'][name]))
             report.append(one_line_graph)
             report.append('{}'.format(
                 TESTS['iobenchmark']['Data'][name]['Avg/Min/Max']))