diff --git a/conf/conf_example.xml b/conf/conf_example.xml
index e86fefee94..3fef85777f 100644
--- a/conf/conf_example.xml
+++ b/conf/conf_example.xml
@@ -19,6 +19,16 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="Bumblebee_Quad"
+   ac_id="40"
+   airframe="airframes/examples/bumblebee_quad.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
+   gui_color="white"
+  />
   <aircraft
    name="EasyStar_ETS"
    ac_id="8"
@@ -69,16 +79,6 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/control/ctl_dash_loiter_trim.xml settings/estimation/ins_neutrals.xml"
    gui_color="blue"
   />
-  <aircraft
-   name="Bumblebee_Quad"
-   ac_id="40"
-   airframe="airframes/examples/bumblebee_quad.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-   gui_color="white"
-  />
   <aircraft
    name="Quad_LisaMX"
    ac_id="30"
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index ac55c18eae..bfcd52169d 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -189,16 +189,6 @@
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
    gui_color="white"
   />
-  <aircraft
-   name="Quad_Navstik"
-   ac_id="180"
-   airframe="airframes/examples/quadrotor_navstik.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-   gui_color="#710080"
-  />
   <aircraft
    name="Quad_NavGo"
    ac_id="151"
@@ -209,6 +199,16 @@
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/modules/rotorcraft_cam.xml settings/modules/servo_switch.xml"
    gui_color="white"
   />
+  <aircraft
+   name="Quad_Navstik"
+   ac_id="180"
+   airframe="airframes/examples/quadrotor_navstik.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_rotorcraft.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
+   gui_color="#710080"
+  />
   <aircraft
    name="Twinjet"
    ac_id="6"
@@ -259,6 +259,16 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml settings/control/tune_agr_climb.xml settings/modules/dc.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="apogee_chibios"
+   ac_id="14"
+   airframe="airframes/ENAC/fixed-wing/apogee.xml"
+   radio="radios/T10CG_SBUS.xml"
+   telemetry="telemetry/default_fixedwing_imu.xml"
+   flight_plan="flight_plans/basic.xml"
+   settings=" settings/fixedwing_basic.xml"
+   gui_color="blue"
+  />
   <aircraft
    name="ardrone2_raw"
    ac_id="201"