diff --git a/conf/autopilot/booz2_autopilot.makefile b/conf/autopilot/booz2_autopilot.makefile
index 7f0a9bf137..0da5e9b997 100644
--- a/conf/autopilot/booz2_autopilot.makefile
+++ b/conf/autopilot/booz2_autopilot.makefile
@@ -118,6 +118,10 @@ ap.srcs += $(BOOZ_PRIV)/booz_supervision_int.c
 
 ap.CFLAGS += -DHS_YAW
 
-# Joystick
-ap.CFLAGS += -DUSE_DATALINK_FMS -DFMS_USE_COMMANDS_RAW
 ap.srcs += $(BOOZ_PRIV)/booz2_fms.c
+
+#ap.CFLAGS += -DBOOZ2_FMS_TYPE=BOOZ2_FMS_TYPE_DATALINK -DFMS_DATALINK_USE_COMMANDS_RAW
+#ap.srcs += $(BOOZ_PRIV)/booz2_fms_datalink.c
+
+ap.CFLAGS += -DBOOZ2_FMS_TYPE=BOOZ2_FMS_TYPE_TEST_SIGNAL
+ap.srcs += $(BOOZ_PRIV)/booz2_fms_test_signal.c