diff --git a/conf/settings/settings_lisa_test_boards.xml b/conf/settings/settings_lisa_test_boards.xml
new file mode 100644
index 0000000000..650dbadd5c
--- /dev/null
+++ b/conf/settings/settings_lisa_test_boards.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE settings SYSTEM "settings.dtd">
+
+<settings>
+  <dl_settings>
+    <dl_setting var="cur_test" min="0" step="1" max="2" shortname="test" values="None|Baro|Bldc|Servos|Uarts" module="lisa/test/test_board" handler="SetCurTest">
+      <!--         <key_press key="d" value="0"/> -->
+    </dl_setting>
+  </dl_settings>
+</settings>
\ No newline at end of file
diff --git a/sw/airborne/lisa/test/test_board.c b/sw/airborne/lisa/test/test_board.c
new file mode 100644
index 0000000000..d464365898
--- /dev/null
+++ b/sw/airborne/lisa/test/test_board.c
@@ -0,0 +1,318 @@
+/*
+ * $Id$
+ *  
+ * Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. 
+ */
+
+#include <inttypes.h>
+#include <string.h>
+
+#define DATALINK_C
+
+#include "test_board.h"
+
+#include "std.h"
+#include "init_hw.h"
+#include "sys_time.h"
+#include "downlink.h"
+#include "led.h"
+#include "uart.h"
+
+#include "datalink.h"
+#include "settings.h"
+
+#include "lisa/lisa_baro.h"
+#include "booz/actuators/booz_actuators_pwm.h"
+
+static inline void main_init( void );
+static inline void main_periodic_task( void );
+static inline void main_event_task( void );
+
+static void test_none_start(void);
+static void test_none_periodic(void);
+static void test_none_event(void);
+
+static void test_baro_start(void);
+static void test_baro_periodic(void);
+static void test_baro_event(void);
+
+static void test_bldc_start(void);
+static void test_bldc_periodic(void);
+static void test_bldc_event(void);
+
+static void test_srvo_start(void);
+static void test_srvo_periodic(void);
+static void test_srvo_event(void);
+
+static void test_uart_start(void);
+static void test_uart_periodic(void);
+static void test_uart_event(void);
+
+static void all_led_green(void);
+static void all_led_red(void);
+static void all_led_off(void);
+
+struct TestFuns {
+  void (*_start)(void);
+  void (*_periodic)(void);
+  void (*_event)(void);
+};
+
+struct TestFuns tests[] = {
+  {._start=test_none_start, ._periodic=test_none_periodic, ._event=test_none_event},
+  {._start=test_baro_start, ._periodic=test_baro_periodic, ._event=test_baro_event},
+  {._start=test_bldc_start, ._periodic=test_bldc_periodic, ._event=test_bldc_event},
+  {._start=test_srvo_start, ._periodic=test_srvo_periodic, ._event=test_srvo_event},
+  {._start=test_uart_start, ._periodic=test_uart_periodic, ._event=test_uart_event}
+};
+
+enum TestType cur_test;
+
+
+int main( void ) {
+  main_init();
+  while(1) {
+    if (sys_time_periodic())
+      main_periodic_task();
+    main_event_task();
+  }
+  return 0;
+}
+
+static inline void main_init( void ) {
+  hw_init();
+  sys_time_init();
+  led_init();
+
+  baro_init();
+  booz_actuators_pwm_hw_init();
+
+  cur_test = TestTypeNone;
+
+}
+
+static inline void main_periodic_task( void ) {
+
+  LED_PERIODIC();
+  RunOnceEvery(256, {DOWNLINK_SEND_ALIVE(DefaultChannel, 16, MD5SUM);});
+
+  tests[cur_test]._periodic();
+
+}
+
+static inline void main_event_task( void ) {
+
+  DatalinkEvent();
+
+  tests[cur_test]._event();
+  
+}
+
+void start_test(void) {
+  all_led_off();
+  tests[cur_test]._start();
+}
+
+
+
+
+/*
+ *
+ * Test nothing
+ *
+ */
+static void test_none_start(void) {}
+static void test_none_periodic(void) {}
+static void test_none_event(void) {}
+
+
+/*
+ *
+ * Test baro
+ *
+ */
+static inline void test_baro_on_baro_diff(void);
+static inline void test_baro_on_baro_abs(void);
+static void test_baro_start(void) {all_led_green();}
+static void test_baro_periodic(void) { RunOnceEvery(2, {baro_periodic();}); }
+static void test_baro_event(void) {BaroEvent(test_baro_on_baro_abs, test_baro_on_baro_diff);}
+static inline void test_baro_on_baro_abs(void) {
+  RunOnceEvery(5,{DOWNLINK_SEND_BOOZ_BARO2_RAW(DefaultChannel, &baro.abs_raw, &baro.diff_raw);});
+}
+static inline void test_baro_on_baro_diff(void) { 
+  RunOnceEvery(5,{DOWNLINK_SEND_BOOZ_BARO2_RAW(DefaultChannel, &baro.abs_raw, &baro.diff_raw);});
+}
+
+/*
+ *
+ * Test motor controller
+ *
+ */
+static void test_bldc_start(void) {}
+static void test_bldc_periodic(void) {
+  i2c1_buf[0] = 0x04;
+  i2c1_transmit(0x58, 1, NULL);
+}
+static void test_bldc_event(void) {}
+
+
+/*
+ *
+ * Test servos
+ *
+ */
+static void test_srvo_start(void) {}
+static void test_srvo_periodic(void) {
+  static float foo = 0.;
+  foo += 0.0025;
+  int32_t bar = 1500 + 500. * sin(foo);
+  for (uint8_t i=0; i<6; i++)
+    booz_actuators_pwm_values[i] = bar;
+  booz_actuators_pwm_commit();
+}
+static void test_srvo_event(void) {}
+
+
+
+/*
+ *
+ * Test Uarts
+ *
+ */
+enum UartTestType { OneToThree, ThreeToOne};
+static const uint8_t buf_src[] = { 42, 43, 44, 45, 46, 122, 126, 128 };
+static       uint8_t buf_dest[sizeof(buf_src)];
+static uint8_t idx_tx;
+static uint8_t idx_rx;
+static enum UartTestType direction;
+
+static void test_uart_start(void) {
+  idx_rx = 0;
+  idx_tx = 0;
+  direction = OneToThree;
+}
+
+static void test_uart_periodic(void) {
+  
+  if (idx_tx<sizeof(buf_src)) {
+    switch (direction) {
+    case OneToThree : uart1_transmit(buf_src[idx_tx]); break;
+    case ThreeToOne : uart3_transmit(buf_src[idx_tx]); break;
+    default: break;
+    }
+    idx_tx++;
+  }
+
+}
+
+static void test_uart_event(void) {
+  
+  if (Uart3ChAvailable()) {
+    buf_dest[idx_rx] = Uart3Getch();
+    if (idx_rx<sizeof(buf_src)) {
+      DOWNLINK_SEND_DEBUG(DefaultChannel, sizeof(buf_src), buf_dest);
+      idx_rx++;
+      if (idx_rx == sizeof(buf_src)) {
+	if ( memcmp(buf_dest, buf_src, sizeof(buf_src)) ) {
+	  all_led_red();  // test failed
+	}
+	else { // start test in other direction
+	    idx_rx = 0;
+	    idx_tx = 0;
+	    direction = ThreeToOne;
+	}
+      }
+    }
+  }
+
+  if (Uart1ChAvailable()) {
+    buf_dest[idx_rx] = Uart1Getch();
+    if (idx_rx<sizeof(buf_src)) {
+      DOWNLINK_SEND_DEBUG(DefaultChannel, sizeof(buf_src), buf_dest);
+      idx_rx++;
+      if (idx_rx == sizeof(buf_src)) {
+	if ( memcmp(buf_dest, buf_src, sizeof(buf_src)) ) {
+	  all_led_red();
+	}
+	else {
+	  all_led_green();
+	}
+      }
+    }
+  }
+}
+
+
+
+/*
+ *
+ * LED utilities
+ *
+ */
+
+static void all_led_green(void) {
+  LED_OFF(0); LED_OFF(2); LED_OFF(4); LED_OFF(6);
+  LED_ON(1);  LED_ON(3);  LED_ON(5);  LED_ON(7);
+}
+
+static void all_led_red(void) {
+  LED_OFF(1); LED_OFF(3); LED_OFF(5); LED_OFF(7);
+  LED_ON(0);  LED_ON(2);  LED_ON(4);  LED_ON(6);
+}
+
+static void all_led_off(void) {
+  LED_OFF(0); LED_OFF(2); LED_OFF(4); LED_OFF(6);
+  LED_OFF(1); LED_OFF(3); LED_OFF(5); LED_OFF(7);
+}
+
+
+/*
+ *
+ * Datalink
+ *
+ */
+#define IdOfMsg(x) (x[1])
+
+void dl_parse_msg(void) {
+
+  uint8_t msg_id = IdOfMsg(dl_buffer);
+  switch (msg_id) {
+
+  case  DL_PING:
+    {
+      DOWNLINK_SEND_PONG(DefaultChannel);
+    }
+    break;
+
+  case DL_SETTING :
+    {
+      if (DL_SETTING_ac_id(dl_buffer) != AC_ID) break;
+      uint8_t i = DL_SETTING_index(dl_buffer);
+      float var = DL_SETTING_value(dl_buffer);
+      DlSetting(i, var);
+      DOWNLINK_SEND_DL_VALUE(DefaultChannel, &i, &var);
+    }
+    break;
+
+ default:
+    break;
+  }
+}
+
diff --git a/sw/airborne/lisa/test/test_board.h b/sw/airborne/lisa/test/test_board.h
new file mode 100644
index 0000000000..73ec9b7613
--- /dev/null
+++ b/sw/airborne/lisa/test/test_board.h
@@ -0,0 +1,21 @@
+#ifndef LISA_TEST_BOARDS
+#define LISA_TEST_BOARDS
+
+enum TestType {
+  TestTypeNone,
+  TestTypeBaro,
+  TestTypeBldc,
+  TestTypeSrvo,
+  TestTypeUARTS
+};
+
+extern enum TestType cur_test;
+
+#define test_board_SetCurTest(_val) { \
+    cur_test = _val;		      \
+    start_test();		      \
+}
+
+extern void start_test(void);
+
+#endif /* LISA_TEST_BOARDS */