diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 256b89c380..cf6aa3a76d 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -5865,6 +5865,11 @@ Also, ignores heartbeats not from our target system'''
             self.progress("Not alive after test", send_statustext=False)
             if self.sitl.isalive():
                 self.progress("pexpect says it is alive")
+                for tool in "dumpstack.sh", "dumpcore.sh":
+                    tool_filepath = os.path.join(self.rootdir(), 'Tools', 'scripts', tool)
+                    if util.run_cmd([tool_filepath, str(self.sitl.pid)]) != 0:
+                        self.progress("Failed %s" % (tool,))
+                        return False
             else:
                 self.progress("pexpect says it is dead")
             passed = False
diff --git a/Tools/scripts/dumpcore.sh b/Tools/scripts/dumpcore.sh
old mode 100644
new mode 100755