diff --git a/conf/airframes/bebop.xml b/conf/airframes/bebop.xml
index 2d36e8fe83..5d0a4f31a2 100644
--- a/conf/airframes/bebop.xml
+++ b/conf/airframes/bebop.xml
@@ -30,6 +30,7 @@
 
   <modules main_freq="512">
     <load name="geo_mag.xml"/>
+    <load name="air_data.xml"/>
     <load name="send_imu_mag_current.xml"/>
     <!--load name="logger_file.xml">
       <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
@@ -83,6 +84,12 @@
     <set servo="BOTTOM_LEFT" value="motor_mixing.commands[3]"/>
   </command_laws>
 
+  <section name="AIR_DATA" prefix="AIR_DATA_">
+    <define name="CALC_AIRSPEED" value="FALSE"/>
+    <define name="CALC_TAS_FACTOR" value="FALSE"/>
+    <define name="CALC_AMSL_BARO" value="TRUE"/>
+  </section>
+
   <section name="IMU" prefix="IMU_">
     <!-- Magneto calibration -->
     <define name="MAG_X_NEUTRAL" value="18"/>
diff --git a/conf/conf_example.xml b/conf/conf_example.xml
index 7be0976fa7..83e9cce29b 100644
--- a/conf/conf_example.xml
+++ b/conf/conf_example.xml
@@ -227,7 +227,7 @@
    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/estimation/ahrs_secondary.xml settings/estimation/ahrs_float_mlkf.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-   settings_modules=""
+   settings_modules="modules/air_data.xml modules/video_rtp_stream.xml"
    gui_color="red"
   />
   <aircraft
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index 2432c7ad4e..dfe12baae9 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -359,7 +359,7 @@
    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/estimation/ahrs_secondary.xml settings/estimation/ahrs_float_mlkf.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-   settings_modules=""
+   settings_modules="modules/air_data.xml modules/video_rtp_stream.xml"
    gui_color="red"
   />
   <aircraft