2 files changed, 7 insertions, 2 deletions
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile
index fce26fe70..1ad4db40c 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/Makefile
@@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Other files (optional).
-include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
 
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F072xB.ld
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c
index d4c6ae94f..8c7e13d5a 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c
@@ -18,6 +18,7 @@
 #include "hal.h"
 #include "chprintf.h"
 #include "rt_test_root.h"
+#include "oslib_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -66,8 +67,10 @@ int main(void) {
    * sleeping in a loop and check the button state.
    */
   while (true) {
-    if (!palReadPad(GPIOC, GPIOC_BUTTON))
+    if (!palReadPad(GPIOC, GPIOC_BUTTON)) {
       test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
+      test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
+    }
     chThdSleepMilliseconds(500);
   }
 }