diff --git a/ArduPlane/SA/xplane_plane.json b/ArduPlane/SA/xplane_plane.json
index de11f3b271129c..aeb39602f759a8 100644
--- a/ArduPlane/SA/xplane_plane.json
+++ b/ArduPlane/SA/xplane_plane.json
@@ -6,12 +6,13 @@
 
     "sim/operation/override/override_joystick" : { "type" : "fixed", "value" : 1 },
     "sim/operation/override/override_throttles" : { "type" : "fixed", "value" : 1 },
+    "sim/operation/override/override_control_surfaces" : { "type" : "fixed", "value" : 1 },
 
     # ailerons
-    "sim/flightmodel2/wing/elevator1_deg[12]" : { "type" : "angle", "range" : 20, "channel" : 1 }, # right rear
-    "sim/flightmodel2/wing/elevator1_deg[13]" : { "type" : "angle", "range" : -20, "channel" : 9 }, # left rear
+    "sim/flightmodel2/wing/elevator1_deg[12]" : { "type" : "angle", "range" : 20, "channel" : 4 }, # right rear
+    "sim/flightmodel2/wing/elevator1_deg[13]" : { "type" : "angle", "range" : -20, "channel" : 2 }, # left rear
     "sim/flightmodel2/wing/elevator1_deg[14]" : { "type" : "angle", "range" : 20, "channel" : 1 }, # front right
-    "sim/flightmodel2/wing/elevator1_deg[15]" : { "type" : "angle", "range" : -20, "channel" : 9 }, # front left
+    "sim/flightmodel2/wing/elevator1_deg[15]" : { "type" : "angle", "range" : -20, "channel" : 3 }, # front left
 
 #    "sim/cockpit2/controls/wingsweep_ratio" : { "type" : "fixed", "value" : 0}, # wings unsweep when deploy (disabled)
 
diff --git a/Tools/autotest/models/xplane_plane.json b/Tools/autotest/models/xplane_plane.json
index de11f3b271129c..aeb39602f759a8 100644
--- a/Tools/autotest/models/xplane_plane.json
+++ b/Tools/autotest/models/xplane_plane.json
@@ -6,12 +6,13 @@
 
     "sim/operation/override/override_joystick" : { "type" : "fixed", "value" : 1 },
     "sim/operation/override/override_throttles" : { "type" : "fixed", "value" : 1 },
+    "sim/operation/override/override_control_surfaces" : { "type" : "fixed", "value" : 1 },
 
     # ailerons
-    "sim/flightmodel2/wing/elevator1_deg[12]" : { "type" : "angle", "range" : 20, "channel" : 1 }, # right rear
-    "sim/flightmodel2/wing/elevator1_deg[13]" : { "type" : "angle", "range" : -20, "channel" : 9 }, # left rear
+    "sim/flightmodel2/wing/elevator1_deg[12]" : { "type" : "angle", "range" : 20, "channel" : 4 }, # right rear
+    "sim/flightmodel2/wing/elevator1_deg[13]" : { "type" : "angle", "range" : -20, "channel" : 2 }, # left rear
     "sim/flightmodel2/wing/elevator1_deg[14]" : { "type" : "angle", "range" : 20, "channel" : 1 }, # front right
-    "sim/flightmodel2/wing/elevator1_deg[15]" : { "type" : "angle", "range" : -20, "channel" : 9 }, # front left
+    "sim/flightmodel2/wing/elevator1_deg[15]" : { "type" : "angle", "range" : -20, "channel" : 3 }, # front left
 
 #    "sim/cockpit2/controls/wingsweep_ratio" : { "type" : "fixed", "value" : 0}, # wings unsweep when deploy (disabled)