diff --git a/conf/autopilot/subsystems/fixedwing/testing.makefile b/conf/autopilot/subsystems/fixedwing/testing.makefile
index 734699c3081..909daa77150 100644
--- a/conf/autopilot/subsystems/fixedwing/testing.makefile
+++ b/conf/autopilot/subsystems/fixedwing/testing.makefile
@@ -21,7 +21,7 @@ test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC -DUSE_ADC_
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 test_adcs.srcs += downlink.c $(SRC_ARCH)/uart_hw.c xbee.c
 
-test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_adcs.c
+test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test/test_adcs.c
 # pprz_transport.c
 
 
diff --git a/sw/airborne/nova_test_imu.c b/sw/airborne/test/nova_test_imu.c
similarity index 100%
rename from sw/airborne/nova_test_imu.c
rename to sw/airborne/test/nova_test_imu.c
diff --git a/sw/airborne/test_adcs.c b/sw/airborne/test/test_adcs.c
similarity index 100%
rename from sw/airborne/test_adcs.c
rename to sw/airborne/test/test_adcs.c