3 files changed, 10 insertions, 4 deletions
diff --git a/test/rt/testbuild/Makefile b/test/rt/testbuild/Makefile
index 5c07ab587..ce80802c8 100755
--- a/test/rt/testbuild/Makefile
+++ b/test/rt/testbuild/Makefile
@@ -75,7 +75,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.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/test/rt/testbuild/Makefile_win32 b/test/rt/testbuild/Makefile_win32
index 093216059..8625d1e1b 100755
--- a/test/rt/testbuild/Makefile_win32
+++ b/test/rt/testbuild/Makefile_win32
@@ -75,7 +75,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/SIMIA32/compilers/GCC/port.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/test/rt/testbuild/main.c b/test/rt/testbuild/main.c
index 3363e398f..7ac37c74a 100644
--- a/test/rt/testbuild/main.c
+++ b/test/rt/testbuild/main.c
@@ -20,7 +20,8 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
+#include "oslib_test_root.h"
 #include "console.h"
 
 /*
@@ -42,7 +43,8 @@ int main(int argc, char *argv[]) {
   conInit();
   chSysInit();
 
-  test_execute((BaseSequentialStream *)&CD1);
+  test_execute((BaseSequentialStream *)&CD1, &rt_test_suite);
+  test_execute((BaseSequentialStream *)&CD1, &oslib_test_suite);
   if (test_global_fail)
     exit(1);
   else