diff --git a/Tools/autotest/antennatracker.py b/Tools/autotest/antennatracker.py
index f8c68a3e47..5f8c5f6458 100644
--- a/Tools/autotest/antennatracker.py
+++ b/Tools/autotest/antennatracker.py
@@ -29,6 +29,10 @@ class AutoTestTracker(AutoTest):
     def log_name(self):
         return "AntennaTracker"
 
+    def default_speedup(self):
+        '''Tracker seems to be race-free'''
+        return 100
+
     def test_filepath(self):
         return os.path.realpath(__file__)
 
diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 5f3e6cb9c4..aa96275919 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -6936,6 +6936,10 @@ class AutoTestHeli(AutoTestCopter):
     def sitl_start_location(self):
         return SITL_START_LOCATION_AVC
 
+    def default_speedup(self):
+        '''Heli seems to be race-free'''
+        return 100
+
     def is_heli(self):
         return True
 
diff --git a/Tools/autotest/ardusub.py b/Tools/autotest/ardusub.py
index c9ffe548c2..8f775620e1 100644
--- a/Tools/autotest/ardusub.py
+++ b/Tools/autotest/ardusub.py
@@ -59,6 +59,10 @@ class AutoTestSub(AutoTest):
     def log_name(self):
         return "ArduSub"
 
+    def default_speedup(self):
+        '''Sub seems to be race-free'''
+        return 100
+
     def test_filepath(self):
         return os.path.realpath(__file__)
 
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 46774bd822..a17ea8d08b 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -1199,7 +1199,7 @@ class AutoTest(ABC):
                  binary,
                  valgrind=False,
                  gdb=False,
-                 speedup=8,
+                 speedup=None,
                  frame=None,
                  params=None,
                  gdbserver=False,
@@ -1230,6 +1230,8 @@ class AutoTest(ABC):
         self.breakpoints = breakpoints
         self.disable_breakpoints = disable_breakpoints
         self.speedup = speedup
+        if self.speedup is None:
+            self.speedup = self.default_speedup()
         self.sup_binaries = sup_binaries
 
         self.mavproxy = None
@@ -1277,6 +1279,9 @@ class AutoTest(ABC):
             self.rc_thread.join()
             self.rc_thread = None
 
+    def default_speedup(self):
+        return 8
+
     def progress(self, text, send_statustext=True):
         """Display autotest progress text."""
         global __autotest__
diff --git a/Tools/autotest/quadplane.py b/Tools/autotest/quadplane.py
index 72848e86d3..f998d4be56 100644
--- a/Tools/autotest/quadplane.py
+++ b/Tools/autotest/quadplane.py
@@ -55,6 +55,10 @@ class AutoTestQuadPlane(AutoTest):
     def sitl_start_location(self):
         return SITL_START_LOCATION
 
+    def default_speedup(self):
+        '''QuadPlane seems to be race-free'''
+        return 100
+
     def log_name(self):
         return "QuadPlane"