diff --git a/conf/airframes/Poine/booz2_a7.xml b/conf/airframes/Poine/booz2_a7.xml
index d93553eb19..34146a2cd7 100644
--- a/conf/airframes/Poine/booz2_a7.xml
+++ b/conf/airframes/Poine/booz2_a7.xml
@@ -180,12 +180,12 @@
    <load name="vehicle_interface_overo_link.xml"/>
  </modules>
 <!-- -->
- 
+
   <firmware name="rotorcraft">
     <target name="ap" board="lisa_l_1.0">
 <!--      <define name="BOOZ_START_DELAY" value="1"/> -->
       <subsystem name="radio_control" type="spektrum">
-        <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
+        <param name="RADIO_CONTROL_SPEKTRUM_MODEL"
              value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
       </subsystem>
       <subsystem name="actuators"     type="asctec"/>
@@ -202,6 +202,7 @@
   </firmware>
 
   <firmware name="lisa_l_test_progs">
+    <target name="test_servos"   board="lisa_l_1.0"/>
     <target name="test_telemetry"   board="lisa_l_1.0"/>
     <target name="test_baro"        board="lisa_l_1.0"/>
     <target name="test_imu_b2"      board="lisa_l_1.0"/>
@@ -227,7 +228,7 @@
     </target>
     <target name="stm_passthrough" board="lisa_l_1.0"/>
       <subsystem name="radio_control" type="spektrum">
-        <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
+        <param name="RADIO_CONTROL_SPEKTRUM_MODEL"
               value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
       </subsystem>
       <subsystem name="imu" type="b2_v1.1"/>
diff --git a/conf/autopilot/lisa_l_test_progs.makefile b/conf/autopilot/lisa_l_test_progs.makefile
index 5bcb1be066..0378a5b232 100644
--- a/conf/autopilot/lisa_l_test_progs.makefile
+++ b/conf/autopilot/lisa_l_test_progs.makefile
@@ -75,7 +75,7 @@ test_led.CFLAGS += -DUSE_LED
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 
 test_servos.ARCHDIR = $(ARCH)
-test_servos.CFLAGS  = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_servos.CFLAGS  = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT
 test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_servos.LDFLAGS += -lm
 test_servos.srcs += $(SRC_LISA)/test_servos.c 	\
@@ -87,7 +87,7 @@ test_servos.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1
 test_servos.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
 test_servos.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 
-test_servos.srcs += $(SRC_BOOZ)/actuators/booz_actuators_pwm.c $(SRC_BOOZ_ARCH)/actuators/booz_actuators_pwm_arch.c
+test_servos.srcs += $(SRC_FIRMWARE)/actuators/actuators_pwm.c $(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c
 
 
 #
diff --git a/conf/autopilot/lisa_test_progs.makefile b/conf/autopilot/lisa_test_progs.makefile
index c72257f1fb..b496a9bff9 100644
--- a/conf/autopilot/lisa_test_progs.makefile
+++ b/conf/autopilot/lisa_test_progs.makefile
@@ -372,7 +372,7 @@ test_rc_24.srcs += $(SRC_BOOZ)/booz_radio_control.c \
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 
 test_servos.ARCHDIR = $(ARCH)
-test_servos.CFLAGS  = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_servos.CFLAGS  = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT
 test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_servos.LDFLAGS += -lm
 test_servos.srcs += $(SRC_LISA)/test_servos.c   \