diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index d90d43a8e1..3988d0df25 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -102,6 +102,8 @@ def alarm_handler(signum, frame):
     try:
         results.add('TIMEOUT', '<span class="failed-text">FAILED</span>', opts.timeout)
         util.pexpect_close_all()
+        convert_gpx()
+        results.addglob("Google Earth track", '*.kmz')
         results.addfile('Full Logs', 'autotest-output.txt')
         results.addglob('DataFlash Log', '*.flashlog')
         results.addglob("MAVLink log", '*.mavlog')