diff --git a/conf/airframes/fraser_lisa_m_rotorcraft.xml b/conf/airframes/fraser_lisa_m_rotorcraft.xml
index e7f422af28a..0a90e306e5d 100644
--- a/conf/airframes/fraser_lisa_m_rotorcraft.xml
+++ b/conf/airframes/fraser_lisa_m_rotorcraft.xml
@@ -53,6 +53,9 @@
     </target>
     <target name="test_baro_board"          board="lisa_m_1.0"/>
     <target name="test_adc"                 board="lisa_m_1.0"/>
+    <target name="test_imu"                 board="lisa_m_1.0">
+      <subsystem name="imu"           type="aspirin_v1.5"/>
+    </target>
   </firmware>
 
   <modules main_freq="512">
diff --git a/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.1.makefile b/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
index ccb03ea0c9a..e0067cae603 100644
--- a/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
+++ b/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.1.makefile
@@ -56,7 +56,6 @@ imu_CFLAGS += -DUSE_SPI2
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 stm_passthrough.CFLAGS += $(imu_CFLAGS)
 stm_passthrough.srcs += $(imu_srcs)
 
diff --git a/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.2.makefile b/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
index e431179391e..1531212233c 100644
--- a/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
+++ b/conf/firmwares/subsystems/lisa_passthrough/imu_b2_v1.2.makefile
@@ -58,7 +58,6 @@ imu_CFLAGS += -DUSE_I2C2
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 stm_passthrough.CFLAGS += $(imu_CFLAGS)
 stm_passthrough.srcs += $(imu_srcs)
 
diff --git a/conf/firmwares/subsystems/rotorcraft/imu_crista.makefile b/conf/firmwares/subsystems/rotorcraft/imu_crista.makefile
index f655e6f7eba..417a16b278a 100644
--- a/conf/firmwares/subsystems/rotorcraft/imu_crista.makefile
+++ b/conf/firmwares/subsystems/rotorcraft/imu_crista.makefile
@@ -76,7 +76,6 @@ else ifeq ($(ARCH), stm32)
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
 
diff --git a/conf/firmwares/subsystems/rotorcraft/imu_crista_hmc5843.makefile b/conf/firmwares/subsystems/rotorcraft/imu_crista_hmc5843.makefile
index aed1d1d5c35..f9dd3821d39 100644
--- a/conf/firmwares/subsystems/rotorcraft/imu_crista_hmc5843.makefile
+++ b/conf/firmwares/subsystems/rotorcraft/imu_crista_hmc5843.makefile
@@ -77,7 +77,6 @@ imu_CFLAGS += -DUSE_I2C2
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
 
diff --git a/conf/firmwares/subsystems/shared/imu_analog.makefile b/conf/firmwares/subsystems/shared/imu_analog.makefile
index 2fb4310e3f3..c0d084b64f7 100644
--- a/conf/firmwares/subsystems/shared/imu_analog.makefile
+++ b/conf/firmwares/subsystems/shared/imu_analog.makefile
@@ -90,6 +90,8 @@ $(error Not implemented for the stm32 yet... should be trivial, just do it...)
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
+
+test_imu.CFLAG += $(imu_CFLAGS)
+test_imu.srcs += $(imu_srcs)
diff --git a/conf/firmwares/subsystems/shared/imu_apogee.makefile b/conf/firmwares/subsystems/shared/imu_apogee.makefile
index 6b389e35bb9..785df41b7ce 100644
--- a/conf/firmwares/subsystems/shared/imu_apogee.makefile
+++ b/conf/firmwares/subsystems/shared/imu_apogee.makefile
@@ -26,6 +26,9 @@ ap.CFLAGS += -DAHRS_CORRECT_FREQUENCY=$(AHRS_CORRECT_FREQUENCY)
 ap.CFLAGS += $(IMU_APOGEE_CFLAGS)
 ap.srcs   += $(IMU_APOGEE_SRCS)
 
+test_imu.CFLAGS += $(IMU_APOGEE_CFLAGS)
+test_imu.srcs   += $(IMU_APOGEE_SRCS)
+
 #
 # Simulator
 #
diff --git a/conf/firmwares/subsystems/shared/imu_ardrone2.makefile b/conf/firmwares/subsystems/shared/imu_ardrone2.makefile
index 3a304782341..cc7fa61c834 100644
--- a/conf/firmwares/subsystems/shared/imu_ardrone2.makefile
+++ b/conf/firmwares/subsystems/shared/imu_ardrone2.makefile
@@ -12,7 +12,6 @@ imu_srcs   += $(SRC_BOARD)/navdata.c
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
 
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile b/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
index 968a6c98233..9a2d152c49e 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
@@ -30,6 +30,8 @@ IMU_ASPIRIN2_CFLAGS += -DUSE_$(IMU_ASPIRIN2_I2C_DEV_UPPER)
 ap.CFLAGS += $(IMU_ASPIRIN2_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN2_SRCS)
 
+test_imu.CFLAGS += $(IMU_ASPIRIN2_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN2_SRCS)
 
 #
 # NPS simulator
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.0.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.0.makefile
index 55797ed20ee..a67c9ddda67 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.0.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.0.makefile
@@ -25,6 +25,8 @@ include $(CFG_SHARED)/imu_aspirin_i2c_common.makefile
 IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_VERSION_1_0
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN_SRCS)
+
+test_imu.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN_SRCS)
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.5.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.5.makefile
index c48394620aa..08f387621fd 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.5.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin_i2c_v1.5.makefile
@@ -25,6 +25,8 @@ include $(CFG_SHARED)/imu_aspirin_i2c_common.makefile
 IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_VERSION_1_5
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN_SRCS)
+
+test_imu.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN_SRCS)
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_v1.0.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_v1.0.makefile
index d58fbb5a0e1..ec0d54fe9b8 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin_v1.0.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin_v1.0.makefile
@@ -25,6 +25,8 @@ include $(CFG_SHARED)/imu_aspirin_common.makefile
 IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_VERSION_1_0
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN_SRCS)
+
+test_imu.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN_SRCS)
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_v1.5.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_v1.5.makefile
index 6be651292cf..1d0a4e5f24c 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin_v1.5.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin_v1.5.makefile
@@ -25,6 +25,8 @@ include $(CFG_SHARED)/imu_aspirin_common.makefile
 IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_VERSION_1_5
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN_SRCS)
+
+test_imu.CFLAGS += $(IMU_ASPIRIN_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN_SRCS)
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
index bcadf223b4a..e34869ff12c 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
@@ -40,3 +40,6 @@ include $(CFG_SHARED)/imu_aspirin_v2_common.makefile
 
 ap.CFLAGS += $(IMU_ASPIRIN_2_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN_2_SRCS)
+
+test_imu.CFLAGS += $(IMU_ASPIRIN_2_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN_2_SRCS)
diff --git a/conf/firmwares/subsystems/shared/imu_b2_v1.0.makefile b/conf/firmwares/subsystems/shared/imu_b2_v1.0.makefile
index 2dc88fb6cb7..a24859ff39e 100644
--- a/conf/firmwares/subsystems/shared/imu_b2_v1.0.makefile
+++ b/conf/firmwares/subsystems/shared/imu_b2_v1.0.makefile
@@ -58,6 +58,8 @@ endif
 endif #NO_MAG
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
+
+test_imu.CFLAGS += $(imu_CFLAGS)
+test_imu.srcs += $(imu_srcs)
diff --git a/conf/firmwares/subsystems/shared/imu_b2_v1.1.makefile b/conf/firmwares/subsystems/shared/imu_b2_v1.1.makefile
index c8ad0c8768e..27441696628 100644
--- a/conf/firmwares/subsystems/shared/imu_b2_v1.1.makefile
+++ b/conf/firmwares/subsystems/shared/imu_b2_v1.1.makefile
@@ -58,6 +58,8 @@ imu_CFLAGS += -DMS2100_SPI_DEV=spi2
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
+
+test_imu.CFLAGS += $(imu_CFLAGS)
+test_imu.srcs += $(imu_srcs)
diff --git a/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile b/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
index 9c7800df970..6e8cceb0a57 100644
--- a/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
+++ b/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
@@ -51,6 +51,8 @@ imu_CFLAGS += -DIMU_B2_I2C_DEV=i2c2 -DUSE_I2C2
 endif
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(imu_CFLAGS)
 ap.srcs += $(imu_srcs)
+
+test_imu.CFLAGS += $(imu_CFLAGS)
+test_imu.srcs += $(imu_srcs)
diff --git a/conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile b/conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
index e51c6790551..6bc352a6cde 100644
--- a/conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
+++ b/conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
@@ -74,11 +74,13 @@ IMU_DROTEK_2_CFLAGS += -DUSE_$(DROTEK_2_I2C_DEV_UPPER)
 
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 
 ap.CFLAGS += $(IMU_DROTEK_2_CFLAGS)
 ap.srcs   += $(IMU_DROTEK_2_SRCS)
 
+test_imu.CFLAGS += $(IMU_DROTEK_2_CFLAGS)
+test_imu.srcs   += $(IMU_DROTEK_2_SRCS)
+
 
 #
 # NPS simulator
diff --git a/conf/firmwares/subsystems/shared/imu_gl1.makefile b/conf/firmwares/subsystems/shared/imu_gl1.makefile
index c43a1d8d8a3..d822ab39cc3 100644
--- a/conf/firmwares/subsystems/shared/imu_gl1.makefile
+++ b/conf/firmwares/subsystems/shared/imu_gl1.makefile
@@ -42,11 +42,11 @@ IMU_GL1_CFLAGS += -DGL1_I2C_DEV=$(GL1_I2C_DEV_LOWER)
 IMU_GL1_CFLAGS += -DUSE_$(GL1_I2C_DEV_UPPER)
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 ap.CFLAGS += $(IMU_GL1_CFLAGS)
 ap.srcs   += $(IMU_GL1_SRCS)
 
-
+test_imu.CFLAGS += $(IMU_GL1_CFLAGS)
+test_imu.srcs   += $(IMU_GL1_SRCS)
 
 #
 # NPS simulator
diff --git a/conf/firmwares/subsystems/shared/imu_krooz_sd.makefile b/conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
index 0998c44b66d..7a9e1c43eef 100644
--- a/conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
+++ b/conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
@@ -28,6 +28,9 @@ IMU_KROOZ_CFLAGS += -DAHRS_MAG_CORRECT_FREQUENCY=$(AHRS_MAG_CORRECT_FREQUENCY)
 ap.CFLAGS += $(IMU_KROOZ_CFLAGS)
 ap.srcs   += $(IMU_KROOZ_SRCS)
 
+test_imu.CFLAGS += $(IMU_KROOZ_CFLAGS)
+test_imu.srcs   += $(IMU_KROOZ_SRCS)
+
 #
 # NPS simulator
 #
diff --git a/conf/firmwares/subsystems/shared/imu_krooz_sd_memsic.makefile b/conf/firmwares/subsystems/shared/imu_krooz_sd_memsic.makefile
index 82058e32663..fd1c1e8a100 100644
--- a/conf/firmwares/subsystems/shared/imu_krooz_sd_memsic.makefile
+++ b/conf/firmwares/subsystems/shared/imu_krooz_sd_memsic.makefile
@@ -33,6 +33,9 @@ IMU_KROOZ_CFLAGS += -DAHRS_MAG_CORRECT_FREQUENCY=$(AHRS_MAG_CORRECT_FREQUENCY)
 ap.CFLAGS += $(IMU_KROOZ_CFLAGS)
 ap.srcs   += $(IMU_KROOZ_SRCS)
 
+test_imu.CFLAGS += $(IMU_KROOZ_CFLAGS)
+test_imu.srcs   += $(IMU_KROOZ_SRCS)
+
 #
 # NPS simulator
 #
diff --git a/conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile b/conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
index 7f75e5c3a98..48caa3b4872 100644
--- a/conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
+++ b/conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
@@ -64,6 +64,9 @@ IMU_ASPIRIN_2_CFLAGS += -DUSE_SPI_SLAVE1
 ap.CFLAGS += $(IMU_ASPIRIN_2_CFLAGS)
 ap.srcs   += $(IMU_ASPIRIN_2_SRCS)
 
+test_imu.CFLAGS += $(IMU_ASPIRIN_2_CFLAGS)
+test_imu.srcs   += $(IMU_ASPIRIN_2_SRCS)
+
 #
 # NPS simulator
 #
diff --git a/conf/firmwares/subsystems/shared/imu_mpu6000_hmc5883.makefile b/conf/firmwares/subsystems/shared/imu_mpu6000_hmc5883.makefile
index bb6f8ba847c..bbde01098e1 100644
--- a/conf/firmwares/subsystems/shared/imu_mpu6000_hmc5883.makefile
+++ b/conf/firmwares/subsystems/shared/imu_mpu6000_hmc5883.makefile
@@ -91,6 +91,9 @@ IMU_CFLAGS += -DUSE_$(IMU_MPU_SPI_SLAVE_IDX)
 ap.CFLAGS += $(IMU_CFLAGS)
 ap.srcs   += $(IMU_SRCS)
 
+test_imu.CFLAGS += $(IMU_CFLAGS)
+test_imu.srcs   += $(IMU_SRCS)
+
 #
 # NPS simulator
 #
diff --git a/conf/firmwares/subsystems/shared/imu_ppzuav.makefile b/conf/firmwares/subsystems/shared/imu_ppzuav.makefile
index d15e1e83817..66b69c02e85 100644
--- a/conf/firmwares/subsystems/shared/imu_ppzuav.makefile
+++ b/conf/firmwares/subsystems/shared/imu_ppzuav.makefile
@@ -20,3 +20,6 @@ endif
 
 ap.CFLAGS += $(IMU_PPZUAV_CFLAGS)
 ap.srcs   += $(IMU_PPZUAV_SRCS)
+
+test_imu.CFLAGS += $(IMU_PPZUAV_CFLAGS)
+test_imu.srcs   += $(IMU_PPZUAV_SRCS)
diff --git a/conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile b/conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
index 68a7bc0099a..61e3811eb80 100644
--- a/conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
+++ b/conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
@@ -58,11 +58,12 @@ IMU_PX4FMU_CFLAGS += -DUSE_I2C2
 
 
 # Keep CFLAGS/Srcs for imu in separate expression so we can assign it to other targets
-# see: conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile for example
 
 ap.CFLAGS += $(IMU_PX4FMU_CFLAGS)
 ap.srcs   += $(IMU_PX4FMU_SRCS)
 
+test_imu.CFLAGS += $(IMU_PX4FMU_CFLAGS)
+test_imu.srcs   += $(IMU_PX4FMU_SRCS)
 
 #
 # NPS simulator
diff --git a/conf/firmwares/subsystems/shared/imu_yai.makefile b/conf/firmwares/subsystems/shared/imu_yai.makefile
index 4763f2103b5..1aec6d66a3a 100644
--- a/conf/firmwares/subsystems/shared/imu_yai.makefile
+++ b/conf/firmwares/subsystems/shared/imu_yai.makefile
@@ -36,3 +36,6 @@ include $(CFG_SHARED)/imu_b2_common.makefile
 
 ap.srcs += $(imu_srcs)
 ap.CFLAGS += $(imu_CFLAGS)
+
+test_imu.srcs += $(imu_srcs)
+test_imu.CFLAGS += $(imu_CFLAGS)
diff --git a/conf/firmwares/subsystems/shared/spi_master.makefile b/conf/firmwares/subsystems/shared/spi_master.makefile
index 3dea6f2fbb9..462a3c5e800 100644
--- a/conf/firmwares/subsystems/shared/spi_master.makefile
+++ b/conf/firmwares/subsystems/shared/spi_master.makefile
@@ -8,7 +8,7 @@ SPI_INCLUDED = 1
 SPI_CFLAGS = -DUSE_SPI -DSPI_MASTER
 SPI_SRCS = mcu_periph/spi.c $(SRC_ARCH)/mcu_periph/spi_arch.c
 
-ap.CFLAGS += $(SPI_CFLAGS)
-ap.srcs += $(SPI_SRCS)
+$(TARGET).CFLAGS += $(SPI_CFLAGS)
+$(TARGET).srcs += $(SPI_SRCS)
 
 endif
diff --git a/conf/firmwares/test_progs.makefile b/conf/firmwares/test_progs.makefile
index 5322787dc93..a3a1059cd0c 100644
--- a/conf/firmwares/test_progs.makefile
+++ b/conf/firmwares/test_progs.makefile
@@ -307,3 +307,23 @@ test_adc.CFLAGS += $(COMMON_TELEMETRY_CFLAGS)
 test_adc.srcs   += $(COMMON_TELEMETRY_SRCS)
 test_adc.srcs   += $(SRC_ARCH)/mcu_periph/adc_arch.c
 test_adc.srcs   += test/mcu_periph/test_adc.c
+
+
+#
+# test_imu
+#
+# add imu subsystem to test_imu target!
+#
+# configuration
+#   SYS_TIME_LED
+#   MODEM_PORT
+#   MODEM_BAUD
+#
+test_imu.ARCHDIR = $(ARCH)
+test_imu.CFLAGS += $(COMMON_TEST_CFLAGS)
+test_imu.srcs   += $(COMMON_TEST_SRCS)
+test_imu.CFLAGS += $(COMMON_TELEMETRY_CFLAGS)
+test_imu.srcs   += $(COMMON_TELEMETRY_SRCS)
+test_imu.srcs   += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
+test_imu.srcs   += test/subsystems/test_imu.c
+test_imu.srcs   += math/pprz_trig_int.c