diff --git a/.bin/Scripts/hw-diags-audio b/.bin/Scripts/hw-diags-audio
index 531ccb92..88168263 100755
--- a/.bin/Scripts/hw-diags-audio
+++ b/.bin/Scripts/hw-diags-audio
@@ -15,6 +15,7 @@ if __name__ == '__main__':
     try:
         # Prep
         clear_screen()
+        print_standard('Hardware Diagnostics: Audio\n')
 
         # Set volume
         try:
@@ -24,9 +25,11 @@ if __name__ == '__main__':
             print_error('Failed to set volume')
         
         # Run tests
-        run_program('speaker-test -c 2 -l 1 -t pink'.split(), check=False)
-        #run_program('speaker-test -c 2 -l 1 -t sine'.split(), check=False)
-        run_program('speaker-test -c 2 -l 1 -t wav'.split(), check=False)
+        for mode in ['pink', 'wav']:
+            run_program(
+                cmd = 'speaker-test -c 2 -l 1 -t {}'.format(mode).split(),
+                check = False,
+                pipe = False)
         
         # Done
         #print_standard('\nDone.')
diff --git a/.bin/Scripts/hw-diags-network b/.bin/Scripts/hw-diags-network
index b542d739..5fdd26a4 100755
--- a/.bin/Scripts/hw-diags-network
+++ b/.bin/Scripts/hw-diags-network
@@ -19,6 +19,7 @@ if __name__ == '__main__':
     try:
         # Prep
         clear_screen()
+        print_standard('Hardware Diagnostics: Network\n')
 
         # Connect
         print_standard('Initializing...')