diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py
index 1a64b61f5e..049333c3dd 100644
--- a/Tools/autotest/apmrover2.py
+++ b/Tools/autotest/apmrover2.py
@@ -929,8 +929,6 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm)
         ret = super(AutoTestRover, self).tests()
 
         ret.extend([
-            ("ArmFeatures", "Arm features", self.test_arm_feature),
-
             ("MAVProxy_SetModeUsingSwitch",
              "Set modes via mavproxy switch",
              self.test_setting_modes_via_mavproxy_switch),
diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 14c851889d..7d09e93f1b 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -2794,8 +2794,6 @@ class AutoTestCopter(AutoTest):
              "Set modes via auxswitch",
              self.test_setting_modes_via_auxswitch),
 
-            ("ArmFeatures", "Arm features", self.test_arm_feature),
-
             ("AutoTune", "Fly AUTOTUNE mode", self.fly_autotune),
 
             ("RecordThenPlayMission",
@@ -2929,8 +2927,6 @@ class AutoTestHeli(AutoTestCopter):
         '''return list of all tests'''
         ret = super(AutoTestCopter, self).tests()
         ret.extend([
-            ("ArmFeatures", "Arm features", self.test_arm_feature),
-
             ("AVCMission", "Fly AVC mission", self.fly_avc_test),
 
             ("LogDownLoad",
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index 2e32fd2d90..4efa18dffe 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -887,8 +887,6 @@ class AutoTestPlane(AutoTest):
 
             ("TestFlaps", "Flaps", self.fly_flaps),
 
-            ("ArmFeatures", "Arm features", self.test_arm_feature),
-
             ("MainFlight",
              "Lots of things in one flight",
              self.test_main_flight),
diff --git a/Tools/autotest/ardusub.py b/Tools/autotest/ardusub.py
index e83ebbbeec..12c28def4c 100644
--- a/Tools/autotest/ardusub.py
+++ b/Tools/autotest/ardusub.py
@@ -222,8 +222,6 @@ class AutoTestSub(AutoTest):
         ret = super(AutoTestSub, self).tests()
 
         ret.extend([
-            ("ArmFeatures", "Arm features", self.test_arm_feature),
-
             ("DiveManual", "Dive manual", self.dive_manual),
 
             ("DiveMission",
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index fe19f4545d..9db9f6cf8c 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -2246,6 +2246,8 @@ switch value'''
 
     def tests(self):
         return [
+            ("ArmFeatures", "Arm features", self.test_arm_feature),
+
             ("SetHome",
             "Test Set Home",
              self.fly_test_set_home),
diff --git a/Tools/autotest/quadplane.py b/Tools/autotest/quadplane.py
index f7e1218f34..e165a319e3 100644
--- a/Tools/autotest/quadplane.py
+++ b/Tools/autotest/quadplane.py
@@ -202,8 +202,6 @@ class AutoTestQuadPlane(AutoTest):
 
         ret = super(AutoTestQuadPlane, self).tests()
         ret.extend([
-            ("ArmFeatures", "Arm features", self.test_arm_feature),
-
             ("TestMotorMask", "Test output_motor_mask", self.test_motor_mask),
 
             ("QAutoTune", "Fly QAUTOTUNE mode", self.fly_qautotune),