diff --git a/Tools/autotest/default_params/sailboat-motor.parm b/Tools/autotest/default_params/sailboat-motor.parm
index de9ac2f0be..54feeff69c 100644
--- a/Tools/autotest/default_params/sailboat-motor.parm
+++ b/Tools/autotest/default_params/sailboat-motor.parm
@@ -2,6 +2,8 @@ FRAME_CLASS 2
 LOIT_TYPE 1
 LOIT_RADIUS 5
 MOT_SLEWRATE 0
+RC7_OPTION 74
+SERVO3_FUNCTION 70
 SERVO4_FUNCTION 89
 SERVO4_MIN 1000
 SERVO4_MAX 2000
diff --git a/Tools/autotest/default_params/sailboat.parm b/Tools/autotest/default_params/sailboat.parm
index c05718fe29..3a4a6db9cb 100644
--- a/Tools/autotest/default_params/sailboat.parm
+++ b/Tools/autotest/default_params/sailboat.parm
@@ -10,7 +10,7 @@ SIM_WIND_T 1
 WNDVN_TYPE 10
 WNDVN_SPEED_TYPE 10
 WP_OVERSHOOT 10
-SAIL_ENABLE 2
+SAIL_ENABLE 1
 RPM_MIN 0
 RPM_TYPE 3
 ARSPD_OFFSET 2013