From 94236f4be7a040aaae3cd6c34cf35870e8008ca4 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Mon, 16 Oct 2017 20:41:12 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10838
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c              | 2 +-
 demos/AVR/RT-ARDUINO-MEGA/main.c                        | 4 ++--
 demos/LPC21xx/RT-LPC214x-OLIMEX/main.c                  | 4 ++--
 demos/SPC5/NIL-SPC560D-EVB/main.c                       | 2 +-
 demos/SPC5/RT-SPC560B-EVB/main.c                        | 2 +-
 demos/SPC5/RT-SPC560D-EVB/main.c                        | 2 +-
 demos/SPC5/RT-SPC560P-EVB/main.c                        | 2 +-
 demos/SPC5/RT-SPC563M-EVB/main.c                        | 2 +-
 demos/SPC5/RT-SPC564A-EVB/main.c                        | 2 +-
 demos/SPC5/RT-SPC56EC-EVB/main.c                        | 2 +-
 demos/SPC5/RT-SPC56EL-EVB/main.c                        | 2 +-
 demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/main.c        | 2 +-
 demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/main.c       | 2 +-
 demos/STM32/NIL-STM32F051-DISCOVERY/main.c              | 2 +-
 demos/STM32/NIL-STM32F303-DISCOVERY/main.c              | 2 +-
 demos/STM32/NIL-STM32F746G-DISCOVERY/main.c             | 2 +-
 demos/STM32/RT-STM32-LWIP-FATFS-USB/main.c              | 2 +-
 demos/STM32/RT-STM32F030R8-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F031K6-NUCLEO32/main.c              | 4 ++--
 demos/STM32/RT-STM32F042K6-NUCLEO32/main.c              | 4 ++--
 demos/STM32/RT-STM32F051-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F070RB-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F072-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F072RB-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F091RC-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F100-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F103-MAPLEMINI/main.c               | 2 +-
 demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c | 2 +-
 demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c       | 4 ++--
 demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c | 2 +-
 demos/STM32/RT-STM32F103RB-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c         | 2 +-
 demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c        | 4 ++--
 demos/STM32/RT-STM32F207-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F302R8-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c          | 4 ++--
 demos/STM32/RT-STM32F303-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F303K8-NUCLEO32/main.c              | 4 ++--
 demos/STM32/RT-STM32F303RE-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F334-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F334R8-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c          | 4 ++--
 demos/STM32/RT-STM32F401C-DISCOVERY/main.c              | 4 ++--
 demos/STM32/RT-STM32F401RE-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp         | 4 ++--
 demos/STM32/RT-STM32F407-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32F410RB-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F411RE-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F429-DISCOVERY/main.c               | 2 +-
 demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F446RE-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F469I-DISCOVERY/main.c              | 2 +-
 demos/STM32/RT-STM32F746G-DISCOVERY/main.c              | 1 -
 demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c             | 4 ++--
 demos/STM32/RT-STM32F769I-DISCOVERY/main.c              | 4 ++--
 demos/STM32/RT-STM32L031K6-NUCLEO32/main.c              | 4 ++--
 demos/STM32/RT-STM32L053-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32L053R8-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32L152-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32L152RE-NUCLEO64/main.c              | 4 ++--
 demos/STM32/RT-STM32L432KC-NUCLEO32/main.c              | 4 ++--
 demos/STM32/RT-STM32L476-DISCOVERY/main.c               | 4 ++--
 demos/STM32/RT-STM32L476RG-NUCLEO64/main.c              | 4 ++--
 demos/various/RT-Posix-Simulator/main.c                 | 2 +-
 demos/various/RT-Win32-Simulator/main.c                 | 2 +-
 os/various/shell/shell_cmd.c                            | 2 +-
 test/rt/source/test/rt_test_root.c                      | 1 -
 test/rt/source/test/rt_test_root.h                      | 2 ++
 test/rt/source/test/rt_test_sequence_001.c              | 1 -
 test/rt/source/test/rt_test_sequence_002.c              | 1 -
 test/rt/source/test/rt_test_sequence_003.c              | 1 -
 test/rt/source/test/rt_test_sequence_004.c              | 1 -
 test/rt/source/test/rt_test_sequence_005.c              | 1 -
 test/rt/source/test/rt_test_sequence_006.c              | 1 -
 test/rt/source/test/rt_test_sequence_007.c              | 1 -
 test/rt/source/test/rt_test_sequence_008.c              | 1 -
 test/rt/source/test/rt_test_sequence_009.c              | 1 -
 test/rt/source/test/rt_test_sequence_010.c              | 1 -
 test/rt/source/test/rt_test_sequence_011.c              | 1 -
 test/rt/source/test/rt_test_sequence_012.c              | 1 -
 test/rt/source/test/rt_test_sequence_013.c              | 1 -
 tools/ftl/processors/unittest/test/test_root.c.ftl      | 1 -
 tools/ftl/processors/unittest/test/test_root.h.ftl      | 2 ++
 tools/ftl/processors/unittest/test/test_sequence.c.ftl  | 1 -
 90 files changed, 122 insertions(+), 135 deletions(-)

diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c
index 86aa1b1a2..866c3b723 100755
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * LED blinker thread, times are in milliseconds.
diff --git a/demos/AVR/RT-ARDUINO-MEGA/main.c b/demos/AVR/RT-ARDUINO-MEGA/main.c
index b1d353e5f..dd2e663f4 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/main.c
+++ b/demos/AVR/RT-ARDUINO-MEGA/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 static THD_WORKING_AREA(waThread1, 32);
 static THD_FUNCTION(Thread1, arg) {
@@ -56,7 +56,7 @@ int main(void) {
    */
   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
 
-  test_execute((BaseSequentialStream *)&SD1);
+  test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
   while(TRUE) {
     chThdSleepMilliseconds(1000);
   }
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c
index 761a7257d..bc52e4f58 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #define BOTH_BUTTONS (PAL_PORT_BIT(PA_BUTTON1) | PAL_PORT_BIT(PA_BUTTON2))
 
@@ -90,7 +90,7 @@ int main(void) {
     if (!palReadPad(IOPORT1, PA_BUTTON1))
       sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14);
     if (!palReadPad(IOPORT1, PA_BUTTON2))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
   return 0;
diff --git a/demos/SPC5/NIL-SPC560D-EVB/main.c b/demos/SPC5/NIL-SPC560D-EVB/main.c
index 45aa46a66..c8c00c95e 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/main.c
+++ b/demos/SPC5/NIL-SPC560D-EVB/main.c
@@ -110,7 +110,7 @@ THD_FUNCTION(Thread2, arg) {
   /* Waiting for button push and activation of the test suite.*/
   while (true) {
     if (palReadPad(PORT_E, PE_BUTTON1))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/SPC5/RT-SPC560B-EVB/main.c b/demos/SPC5/RT-SPC560B-EVB/main.c
index 15cc43f32..73848f73f 100644
--- a/demos/SPC5/RT-SPC560B-EVB/main.c
+++ b/demos/SPC5/RT-SPC560B-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/SPC5/RT-SPC560D-EVB/main.c b/demos/SPC5/RT-SPC560D-EVB/main.c
index 15cc43f32..73848f73f 100644
--- a/demos/SPC5/RT-SPC560D-EVB/main.c
+++ b/demos/SPC5/RT-SPC560D-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/SPC5/RT-SPC560P-EVB/main.c b/demos/SPC5/RT-SPC560P-EVB/main.c
index bef7114c6..eb07ade01 100644
--- a/demos/SPC5/RT-SPC560P-EVB/main.c
+++ b/demos/SPC5/RT-SPC560P-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/SPC5/RT-SPC563M-EVB/main.c b/demos/SPC5/RT-SPC563M-EVB/main.c
index afb9bcac1..281aba778 100644
--- a/demos/SPC5/RT-SPC563M-EVB/main.c
+++ b/demos/SPC5/RT-SPC563M-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/SPC5/RT-SPC564A-EVB/main.c b/demos/SPC5/RT-SPC564A-EVB/main.c
index afb9bcac1..281aba778 100644
--- a/demos/SPC5/RT-SPC564A-EVB/main.c
+++ b/demos/SPC5/RT-SPC564A-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/SPC5/RT-SPC56EC-EVB/main.c b/demos/SPC5/RT-SPC56EC-EVB/main.c
index 15cc43f32..73848f73f 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/main.c
+++ b/demos/SPC5/RT-SPC56EC-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/SPC5/RT-SPC56EL-EVB/main.c b/demos/SPC5/RT-SPC56EL-EVB/main.c
index bef7114c6..eb07ade01 100644
--- a/demos/SPC5/RT-SPC56EL-EVB/main.c
+++ b/demos/SPC5/RT-SPC56EL-EVB/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/main.c b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/main.c
index 4643ab241..92b02883b 100644
--- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/main.c
+++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/main.c
@@ -66,7 +66,7 @@ int main(void) {
      waiting for a button event, then the test suite is executed.*/
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     OS_TaskDelay(500);
   }
 }
diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/main.c b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/main.c
index 7ba2451d8..00f820843 100644
--- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/main.c
+++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/main.c
@@ -67,7 +67,7 @@ int main(void) {
      waiting for a button event, then the test suite is executed.*/
   while (true) {
     if (palReadLine(LINE_BUTTON_USER))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     OS_TaskDelay(500);
   }
 }
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
index 800dd6bad..6b42af33d 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
@@ -72,7 +72,7 @@ THD_FUNCTION(Thread3, arg) {
   /* Waiting for button push and activation of the test suite.*/
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/main.c b/demos/STM32/NIL-STM32F303-DISCOVERY/main.c
index 0916158c1..228a9f4ae 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/main.c
@@ -96,7 +96,7 @@ THD_FUNCTION(Thread3, arg) {
   /* Waiting for button push and activation of the test suite.*/
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
index 353775113..13c07901c 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
@@ -59,7 +59,7 @@ THD_FUNCTION(Thread2, arg) {
   /* Waiting for button push and activation of the test suite.*/
   while (true) {
     if (palReadLine(LINE_BUTTON_USER))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB/main.c
index 73630bc52..38852d11a 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/main.c
@@ -19,7 +19,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "chprintf.h"
 #include "shell.h"
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c b/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c
index 09f7ebfb1..f8cc3d6c5 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -66,7 +66,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadLine(LINE_ARD_D3))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c
index da36cadbd..c868f8993 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -66,7 +66,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadLine(LINE_ARD_D3))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/main.c b/demos/STM32/RT-STM32F051-DISCOVERY/main.c
index 74725e36d..33fb2be92 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blue LED blinker thread, times are in milliseconds.
@@ -87,7 +87,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/main.c b/demos/STM32/RT-STM32F072-DISCOVERY/main.c
index a46f0ecce..76cc46e3c 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blue LED blinker thread, times are in milliseconds.
@@ -87,7 +87,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c
index 5d7e7cb13..d4c6ae94f 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/main.c
@@ -17,7 +17,7 @@
 #include "ch.h"
 #include "hal.h"
 #include "chprintf.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -67,7 +67,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c b/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/main.c b/demos/STM32/RT-STM32F100-DISCOVERY/main.c
index 1b89c66c9..a33d9e05d 100644
--- a/demos/STM32/RT-STM32F100-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F100-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blinker thread #1.
@@ -86,7 +86,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c
index b4402c3f9..ac267239a 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/main.c
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/main.c
@@ -19,7 +19,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "shell.h"
 #include "chprintf.h"
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
index 5e8d388c7..cf7d527fa 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
@@ -18,7 +18,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "chprintf.h"
 #include "shell.h"
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c
index 414ed96b7..8e32a3ac4 100644
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blinker thread.
@@ -68,7 +68,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
index b4b776abf..7ae75aa63 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/main.c
@@ -19,7 +19,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "chprintf.h"
 #include "shell.h"
diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c
index 307a72023..a33bb6ad5 100644
--- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/main.c
@@ -19,7 +19,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "shell.h"
 #include "chprintf.h"
diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
index e0524c8d9..329f9f0e0 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "lwipthread.h"
 
@@ -76,7 +76,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOC, GPIOC_SWITCH_TAMPER) == 0)
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/main.c b/demos/STM32/RT-STM32F207-DISCOVERY/main.c
index 6c8873009..335a6c293 100644
--- a/demos/STM32/RT-STM32F207-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F207-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -69,7 +69,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c b/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F207ZG-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c b/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c
index 07ab84043..8c7e2ade9 100644
--- a/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c b/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c
index dbc31a6e4..68b1cb2e5 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c
+++ b/demos/STM32/RT-STM32F303-DISCOVERY-REVC/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blinker thread #1.
@@ -94,7 +94,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/main.c b/demos/STM32/RT-STM32F303-DISCOVERY/main.c
index d88515b29..b3703eb86 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blinker thread #1.
@@ -97,7 +97,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c b/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c
index da36cadbd..c868f8993 100644
--- a/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -66,7 +66,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadLine(LINE_ARD_D3))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c b/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/main.c b/demos/STM32/RT-STM32F334-DISCOVERY/main.c
index 26b6dec3b..28c0767bc 100644
--- a/demos/STM32/RT-STM32F334-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F334-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * LEDs blinker thread, times are in milliseconds.
@@ -84,7 +84,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c b/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c b/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c
index 1a2b4df63..087f316fb 100644
--- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c
+++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing LEDs.
@@ -76,7 +76,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_WKUP_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/main.c b/demos/STM32/RT-STM32F401C-DISCOVERY/main.c
index 6c8873009..335a6c293 100644
--- a/demos/STM32/RT-STM32F401C-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F401C-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -69,7 +69,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c
index e5c0f1fcb..143136a2d 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
index 5f714836c..c7e332655 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/main.cpp
@@ -16,7 +16,7 @@
 
 #include "ch.hpp"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 using namespace chibios_rt;
 
@@ -129,7 +129,7 @@ protected:
 
     setName("tester");
 
-    test_execute((BaseSequentialStream *)&SD2);
+    test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     exit(test_global_fail);
   }
 
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/main.c b/demos/STM32/RT-STM32F407-DISCOVERY/main.c
index 6c8873009..335a6c293 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F407-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -69,7 +69,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c b/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F410RB-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c b/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F412ZG-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/main.c b/demos/STM32/RT-STM32F429-DISCOVERY/main.c
index 153298308..a7147f07f 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "chprintf.h"
 #include "shell.h"
diff --git a/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c b/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F429ZI-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c b/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/main.c b/demos/STM32/RT-STM32F469I-DISCOVERY/main.c
index f9f5693d0..6422193a1 100644
--- a/demos/STM32/RT-STM32F469I-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F469I-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 #include "chprintf.h"
 #include "shell.h"
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c
index 75d432601..c54ffd898 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c
@@ -16,7 +16,6 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /*
diff --git a/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c b/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c b/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c
index 8e76d745b..2bba46595 100644
--- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c
+++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -74,7 +74,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD3);
+      test_execute((BaseSequentialStream *)&SD3, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/main.c b/demos/STM32/RT-STM32F769I-DISCOVERY/main.c
index ba9ae86a1..5d647b2cd 100644
--- a/demos/STM32/RT-STM32F769I-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F769I-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * This is a periodic thread that does absolutely nothing except flashing
@@ -72,7 +72,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON_USER))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c b/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c
index da36cadbd..c868f8993 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -66,7 +66,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadLine(LINE_ARD_D3))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L053-DISCOVERY/main.c b/demos/STM32/RT-STM32L053-DISCOVERY/main.c
index ffa768f53..bb12bee7c 100644
--- a/demos/STM32/RT-STM32L053-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32L053-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c b/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c b/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32L073RZ-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/main.c b/demos/STM32/RT-STM32L152-DISCOVERY/main.c
index 79744b507..884443831 100644
--- a/demos/STM32/RT-STM32L152-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32L152-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Blinker thread #1.
@@ -88,7 +88,7 @@ int main(void) {
    */
   while (true) {
     if (palReadPad(GPIOA, GPIOA_BUTTON))
-      test_execute((BaseSequentialStream *)&SD1);
+      test_execute((BaseSequentialStream *)&SD1, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c b/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c
index 00057b532..f198405d6 100644
--- a/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadPad(GPIOC, GPIOC_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c b/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c
index 62f8bc57e..8e847910d 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadLine(LINE_ARD_D3))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/main.c b/demos/STM32/RT-STM32L476-DISCOVERY/main.c
index 50fb1dcd6..f68a533e6 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * LEDs blinker thread, times are in milliseconds.
@@ -69,7 +69,7 @@ int main(void) {
    */
   while (true) {
     if (palReadLine(LINE_JOY_CENTER))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c b/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c
index ac2b582f8..90a50af24 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -65,7 +65,7 @@ int main(void) {
    */
   while (true) {
     if (!palReadLine(LINE_BUTTON))
-      test_execute((BaseSequentialStream *)&SD2);
+      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
     chThdSleepMilliseconds(500);
   }
 }
diff --git a/demos/various/RT-Posix-Simulator/main.c b/demos/various/RT-Posix-Simulator/main.c
index 02d700e73..40e5aafb4 100755
--- a/demos/various/RT-Posix-Simulator/main.c
+++ b/demos/various/RT-Posix-Simulator/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/demos/various/RT-Win32-Simulator/main.c b/demos/various/RT-Win32-Simulator/main.c
index 02d700e73..40e5aafb4 100644
--- a/demos/various/RT-Win32-Simulator/main.c
+++ b/demos/various/RT-Win32-Simulator/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "ch_test.h"
+#include "rt_test_root.h"
 #include "shell.h"
 #include "chprintf.h"
 
diff --git a/os/various/shell/shell_cmd.c b/os/various/shell/shell_cmd.c
index fd28aa89a..cf350ff4d 100644
--- a/os/various/shell/shell_cmd.c
+++ b/os/various/shell/shell_cmd.c
@@ -31,7 +31,7 @@
 #include "chprintf.h"
 
 #if (SHELL_CMD_TEST_ENABLED == TRUE) || defined(__DOXYGEN__)
-#include "ch_test.h"
+#include "rt_test_root.h"
 #endif
 
 /*===========================================================================*/
diff --git a/test/rt/source/test/rt_test_root.c b/test/rt/source/test/rt_test_root.c
index 1516c00a5..d5bb0c426 100644
--- a/test/rt/source/test/rt_test_root.c
+++ b/test/rt/source/test/rt_test_root.c
@@ -43,7 +43,6 @@
  */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 #if !defined(__DOXYGEN__)
diff --git a/test/rt/source/test/rt_test_root.h b/test/rt/source/test/rt_test_root.h
index bc49d6a47..c06c699c5 100644
--- a/test/rt/source/test/rt_test_root.h
+++ b/test/rt/source/test/rt_test_root.h
@@ -22,6 +22,8 @@
 #ifndef RT_TEST_ROOT_H
 #define RT_TEST_ROOT_H
 
+#include "ch_test.h"
+
 #include "rt_test_sequence_001.h"
 #include "rt_test_sequence_002.h"
 #include "rt_test_sequence_003.h"
diff --git a/test/rt/source/test/rt_test_sequence_001.c b/test/rt/source/test/rt_test_sequence_001.c
index 40d212848..4fe1c79e5 100644
--- a/test/rt/source/test/rt_test_sequence_001.c
+++ b/test/rt/source/test/rt_test_sequence_001.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_002.c b/test/rt/source/test/rt_test_sequence_002.c
index 9817d37b2..22be5482d 100644
--- a/test/rt/source/test/rt_test_sequence_002.c
+++ b/test/rt/source/test/rt_test_sequence_002.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_003.c b/test/rt/source/test/rt_test_sequence_003.c
index 13efacb4e..9069502e9 100644
--- a/test/rt/source/test/rt_test_sequence_003.c
+++ b/test/rt/source/test/rt_test_sequence_003.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_004.c b/test/rt/source/test/rt_test_sequence_004.c
index 1ac2ba0d1..67eaefdb1 100644
--- a/test/rt/source/test/rt_test_sequence_004.c
+++ b/test/rt/source/test/rt_test_sequence_004.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_005.c b/test/rt/source/test/rt_test_sequence_005.c
index 4f07ca0be..6b461c926 100644
--- a/test/rt/source/test/rt_test_sequence_005.c
+++ b/test/rt/source/test/rt_test_sequence_005.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_006.c b/test/rt/source/test/rt_test_sequence_006.c
index d505455b9..14aa2dd78 100644
--- a/test/rt/source/test/rt_test_sequence_006.c
+++ b/test/rt/source/test/rt_test_sequence_006.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_007.c b/test/rt/source/test/rt_test_sequence_007.c
index a7deda0db..3ceb82f5c 100644
--- a/test/rt/source/test/rt_test_sequence_007.c
+++ b/test/rt/source/test/rt_test_sequence_007.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_008.c b/test/rt/source/test/rt_test_sequence_008.c
index 96210f9e1..77b49268d 100644
--- a/test/rt/source/test/rt_test_sequence_008.c
+++ b/test/rt/source/test/rt_test_sequence_008.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_009.c b/test/rt/source/test/rt_test_sequence_009.c
index 3fbf636e0..4e738186b 100644
--- a/test/rt/source/test/rt_test_sequence_009.c
+++ b/test/rt/source/test/rt_test_sequence_009.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_010.c b/test/rt/source/test/rt_test_sequence_010.c
index dbaca139f..d21946ef8 100644
--- a/test/rt/source/test/rt_test_sequence_010.c
+++ b/test/rt/source/test/rt_test_sequence_010.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_011.c b/test/rt/source/test/rt_test_sequence_011.c
index 283a3c19f..ca8a1a706 100644
--- a/test/rt/source/test/rt_test_sequence_011.c
+++ b/test/rt/source/test/rt_test_sequence_011.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_012.c b/test/rt/source/test/rt_test_sequence_012.c
index 10e48e921..06f0fe8cf 100644
--- a/test/rt/source/test/rt_test_sequence_012.c
+++ b/test/rt/source/test/rt_test_sequence_012.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/test/rt/source/test/rt_test_sequence_013.c b/test/rt/source/test/rt_test_sequence_013.c
index 13f0c3581..70b80ba88 100644
--- a/test/rt/source/test/rt_test_sequence_013.c
+++ b/test/rt/source/test/rt_test_sequence_013.c
@@ -15,7 +15,6 @@
 */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "rt_test_root.h"
 
 /**
diff --git a/tools/ftl/processors/unittest/test/test_root.c.ftl b/tools/ftl/processors/unittest/test/test_root.c.ftl
index 7970a136c..66035acb3 100755
--- a/tools/ftl/processors/unittest/test/test_root.c.ftl
+++ b/tools/ftl/processors/unittest/test/test_root.c.ftl
@@ -40,7 +40,6 @@
  */
 
 #include "hal.h"
-#include "ch_test.h"
 #include "${prefix_lower}test_root.h"
 
 #if !defined(__DOXYGEN__)
diff --git a/tools/ftl/processors/unittest/test/test_root.h.ftl b/tools/ftl/processors/unittest/test/test_root.h.ftl
index f2498bd0a..c3c8f3203 100755
--- a/tools/ftl/processors/unittest/test/test_root.h.ftl
+++ b/tools/ftl/processors/unittest/test/test_root.h.ftl
@@ -20,6 +20,8 @@
 #ifndef ${prefix_upper}TEST_ROOT_H
 #define ${prefix_upper}TEST_ROOT_H
 
+#include "ch_test.h"
+
 [#list instance.sequences.sequence as sequence]
 #include "${prefix_lower}test_sequence_${(sequence_index + 1)?string("000")}.h"
 [/#list]
diff --git a/tools/ftl/processors/unittest/test/test_sequence.c.ftl b/tools/ftl/processors/unittest/test/test_sequence.c.ftl
index 161957603..85d3fc35f 100755
--- a/tools/ftl/processors/unittest/test/test_sequence.c.ftl
+++ b/tools/ftl/processors/unittest/test/test_sequence.c.ftl
@@ -14,7 +14,6 @@
 [@utils.EmitIndentedCCode "" 2 instance.description.copyright.value[0] /]
 
 #include "hal.h"
-#include "ch_test.h"
 #include "${prefix_lower}test_root.h"
 
 /**
-- 
cgit v1.2.3