diff --git a/Tools/autotest/default_params/firefly.parm b/Tools/autotest/default_params/firefly.parm
index 9c05f9f140..e47dd6741b 100644
--- a/Tools/autotest/default_params/firefly.parm
+++ b/Tools/autotest/default_params/firefly.parm
@@ -1,4 +1,7 @@
-ELEVON_OUTPUT    4
+SERVO1_FUNCTION = 77
+SERVO2_FUNCTION = 78
+SERVO1_REVERSED = 1
+SERVO2_REVERSED = 1
 AHRS_EKF_TYPE    2
 ARMING_RUDDER    2
 ARSPD_FBW_MAX    35
diff --git a/Tools/autotest/default_params/gazebo-zephyr.parm b/Tools/autotest/default_params/gazebo-zephyr.parm
index 786c90509e..a4dd1e6807 100644
--- a/Tools/autotest/default_params/gazebo-zephyr.parm
+++ b/Tools/autotest/default_params/gazebo-zephyr.parm
@@ -1,4 +1,7 @@
-ELEVON_OUTPUT 4
+SERVO1_FUNCTION = 77
+SERVO2_FUNCTION = 78
+SERVO1_REVERSED = 1
+SERVO2_REVERSED = 1
 # we need small INS_ACC offsets so INS is recognised as being calibrated
 INS_ACCOFFS_X   0.001
 INS_ACCOFFS_Y   0.001
diff --git a/Tools/autotest/default_params/plane-jsbsim.parm b/Tools/autotest/default_params/plane-jsbsim.parm
index 636bd747d1..c6839801ef 100644
--- a/Tools/autotest/default_params/plane-jsbsim.parm
+++ b/Tools/autotest/default_params/plane-jsbsim.parm
@@ -66,8 +66,6 @@ PTCH2SRV_P       2.5
 PTCH2SRV_RLL     1
 NAVL1_PERIOD     15
 ACRO_LOCKING     1
-ELEVON_OUTPUT    0
-VTAIL_OUTPUT     0
 # we need small INS_ACC offsets so INS is recognised as being calibrated
 INS_ACCOFFS_X   0.001
 INS_ACCOFFS_Y   0.001
diff --git a/Tools/autotest/default_params/plane-tailsitter.parm b/Tools/autotest/default_params/plane-tailsitter.parm
index 240d891131..71b2f5c55e 100644
--- a/Tools/autotest/default_params/plane-tailsitter.parm
+++ b/Tools/autotest/default_params/plane-tailsitter.parm
@@ -8,7 +8,6 @@ ARSPD_USE       1
 ARSPD_FBW_MAX   30
 ARSPD_FBW_MIN   10
 THR_MAX		100
-ELEVON_OUTPUT   0
 KFF_RDDRMIX     1
 RC1_MAX         2000
 RC1_MIN         1000
diff --git a/Tools/autotest/default_params/plane.parm b/Tools/autotest/default_params/plane.parm
index 2bb423ef93..c6f45175c4 100644
--- a/Tools/autotest/default_params/plane.parm
+++ b/Tools/autotest/default_params/plane.parm
@@ -62,8 +62,6 @@ PTCH2SRV_P       2.5
 PTCH2SRV_RLL     1
 NAVL1_PERIOD     15
 ACRO_LOCKING     1
-ELEVON_OUTPUT    0
-VTAIL_OUTPUT     0
 # we need small INS_ACC offsets so INS is recognised as being calibrated
 INS_ACCOFFS_X   0.001
 INS_ACCOFFS_Y   0.001