diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index 6d43a886a2..8922438048 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -693,11 +693,20 @@ def run_tests(steps):
     global results
 
     corefiles = glob.glob("core*")
+    corefiles.extend(glob.glob("ap-*.core"))
     if corefiles:
         print('Removing corefiles: %s' % str(corefiles))
         for f in corefiles:
             os.unlink(f)
 
+    diagnostic_files = []
+    for p in "dumpstack.sh_*", "dumpcore.sh_*", "autotest-*tlog":
+        diagnostic_files.extend(glob.glob())
+    if diagnostic_files:
+        print('Removing diagnostic files: %s' % str(diagnostic_files))
+        for f in diagnostic_files:
+            os.unlink(f)
+
     passed = True
     failed = []
     failed_testinstances = dict()