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