6 files changed, 18 insertions, 6 deletions
diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile
index 50efac016..1f1d13a97 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile
@@ -103,7 +103,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_v7m.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)/STM32F746xG.ld
diff --git a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile
index cb7c733e9..188986314 100644
--- a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile
+++ b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile
@@ -103,7 +103,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_v7m.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)/STM32F746xG.ld
diff --git a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile
index 50efac016..1f1d13a97 100644
--- a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile
+++ b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile
@@ -103,7 +103,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_v7m.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)/STM32F746xG.ld
diff --git a/testhal/STM32/STM32F7xx/SPI/Makefile b/testhal/STM32/STM32F7xx/SPI/Makefile
index 50efac016..1f1d13a97 100644
--- a/testhal/STM32/STM32F7xx/SPI/Makefile
+++ b/testhal/STM32/STM32F7xx/SPI/Makefile
@@ -103,7 +103,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_v7m.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)/STM32F746xG.ld
diff --git a/testhal/STM32/STM32F7xx/USB_CDC/Makefile b/testhal/STM32/STM32F7xx/USB_CDC/Makefile
index 8a5a9a774..7756b7030 100644
--- a/testhal/STM32/STM32F7xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F7xx/USB_CDC/Makefile
@@ -103,7 +103,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_v7m.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
 include $(CHIBIOS)/os/hal/lib/streams/streams.mk
 include $(CHIBIOS)/os/various/shell/shell.mk
 
diff --git a/testhal/STM32/STM32F7xx/USB_RAW/Makefile b/testhal/STM32/STM32F7xx/USB_RAW/Makefile
index cf6257f33..e4da356fd 100644
--- a/testhal/STM32/STM32F7xx/USB_RAW/Makefile
+++ b/testhal/STM32/STM32F7xx/USB_RAW/Makefile
@@ -103,7 +103,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_v7m.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)/STM32F746xG.ld