diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index e0816dc944..9ed6e1e4bb 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -83,6 +83,7 @@ parser = optparse.OptionParser("autotest")
 parser.add_option("--skip", type='string', default='', help='list of steps to skip (comma separated)')
 parser.add_option("--list", action='store_true', default=False, help='list the available steps')
 parser.add_option("--viewerip", default=None, help='IP address to send MAVLink and fg packets to')
+parser.add_option("--experimental", default=False, action='store_true', help='enable experimental tests')
 
 opts, args = parser.parse_args()
 
@@ -151,6 +152,9 @@ def run_step(step):
         return arducopter.fly_ArduCopter()
 
     if step == 'fly.ArduPlane':
+        if not opts.experimental:
+            print("DISABLED: use --experimental to enable fly.ArduPlane")
+            return True
         return arduplane.fly_ArduPlane(viewerip=opts.viewerip)
 
     if step == 'convertgpx':