diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index c4b81e9b..285fa93d 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -1249,10 +1249,6 @@ def run_diags(state, menu, quick_mode=False):
       # Skip disabled tests
       continue
 
-    # Run safety checks
-    if name.startswith('Disk') and name != 'Disk Attributes':
-      state.disk_safety_checks()
-
     # Run test(s)
     function = details['Function']
     args = [details['Objects']]
@@ -1267,6 +1263,10 @@ def run_diags(state, menu, quick_mode=False):
       state.init_tmux()
       break
 
+    # Run safety checks
+    if name.startswith('Disk'):
+      state.disk_safety_checks(wait_for_self_tests=name != 'Disk Attributes')
+
   # Handle aborts
   if aborted:
     for details in state.tests.values():