diff --git a/tests/testsuite/support/mod.rs b/tests/testsuite/support/mod.rs
index cc7eb09cde0..4196efc3add 100644
--- a/tests/testsuite/support/mod.rs
+++ b/tests/testsuite/support/mod.rs
@@ -1162,7 +1162,7 @@ impl Execs {
 
 impl Drop for Execs {
     fn drop(&mut self) {
-        if !self.ran {
+        if !self.ran && !std::thread::panicking() {
             panic!("forgot to run this command");
         }
     }