diff --git a/conf/firmwares/test_progs.makefile b/conf/firmwares/test_progs.makefile
index 46b00af392..1813b07a92 100644
--- a/conf/firmwares/test_progs.makefile
+++ b/conf/firmwares/test_progs.makefile
@@ -229,6 +229,23 @@ test_telemetry.CFLAGS += $(COMMON_TELEMETRY_CFLAGS)
 test_telemetry.srcs   += $(COMMON_TELEMETRY_SRCS)
 test_telemetry.srcs   += test/test_telemetry.c
 
+#
+# test_datalink : Sends ALIVE and pong telemetry messages
+#
+# configuration
+#   MODEM_PORT :
+#   MODEM_BAUD :
+#
+test_datalink.ARCHDIR = $(ARCH)
+test_datalink.CFLAGS += $(COMMON_TEST_CFLAGS)
+test_datalink.srcs   += $(COMMON_TEST_SRCS)
+test_datalink.CFLAGS += $(COMMON_DATALINK_CFLAGS)
+test_datalink.CFLAGS += $(COMMON_TELEMETRY_CFLAGS)
+test_datalink.srcs   += $(COMMON_DATALINK_SRCS)
+test_datalink.srcs   += $(COMMON_TELEMETRY_SRCS)
+test_datalink.srcs   += test/test_datalink.c
+
+
 #
 # test_math_trig_compressed: Test math trigonometric using compressed data
 #
diff --git a/sw/airborne/test/test_datalink.c b/sw/airborne/test/test_datalink.c
index 6ff8575b4a..58beb110e0 100644
--- a/sw/airborne/test/test_datalink.c
+++ b/sw/airborne/test/test_datalink.c
@@ -19,6 +19,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/**
+ * @file test_datalink.c
+ *
+ * Periodically sends ALIVE (10Hz) and ping/pong (every 5s) telemetry messages.
+ */
 #define DATALINK_C
 
 #include BOARD_CONFIG
@@ -50,6 +55,7 @@ static inline void main_init(void)
 {
   mcu_init();
   sys_time_register_timer((1. / PERIODIC_FREQUENCY), NULL);
+  downlink_init();
 }
 
 static inline void main_periodic(void)
@@ -74,3 +80,4 @@ void dl_parse_msg(void)
     break;
   }
 }
+