diff --git a/bsp_rpi/ObjectFactory.cpp b/bsp_rpi/ObjectFactory.cpp
index 70e6e08e..3e6eeaa2 100644
--- a/bsp_rpi/ObjectFactory.cpp
+++ b/bsp_rpi/ObjectFactory.cpp
@@ -74,7 +74,7 @@ void ObjectFactory::produce(){
     gpio::createRpiGpioConfig(gpioCookieLoopback, gpioIdReader, bcmPinReader, "GPIO_LB_READER",
             gpio::Direction::IN, 0);
     new LibgpiodTest(objects::LIBGPIOD_TEST, objects::GPIO_IF, gpioCookieLoopback);
-#endif
+#endif /* RPI_LOOPBACK_TEST_GPIO == 1 */
 
     new SpiComIF(objects::SPI_COM_IF, gpioIF);
 
@@ -102,5 +102,6 @@ void ObjectFactory::produce(){
     auto mgmHandler = new MGMHandlerLIS3MDL(objects::MGM_0_LIS3_HANDLER,
             objects::SPI_COM_IF, spiCookie);
     mgmHandler->setStartUpImmediately();
-#endif
+
+#endif /* RPI_TEST_ACS_BOARD == 1 */
 }