diff --git a/readme.txt b/readme.txt
index 868df3efa..8933fb56b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,9 @@
 *****************************************************************************
 
 *** Next ***
+- NEW: Increased stacks size in RT test suite from 128 to 192. added an
+       option to override the stack size by defining THREADS_STACK_SIZE
+       in the makefile.
 - NEW: Added STM32L073RZ-Nucleo64 to USB-CDC "multi" demo. Removed old demo.
 - NEW: Added an STM32 WDG "multi" demo. Removed all old WDG demos.
 - NEW: Added option to copy vectors in RAM on GCC startup for ARMv6-M,
diff --git a/test/rt/configuration.xml b/test/rt/configuration.xml
index 269f99a48..6912022c3 100644
--- a/test/rt/configuration.xml
+++ b/test/rt/configuration.xml
@@ -37,27 +37,29 @@
  * Allowed delay in timeout checks.
  */
 #if CH_CFG_ST_TIMEDELTA == 0
-#define ALLOWED_DELAY           2
+  #define ALLOWED_DELAY             2
 #else
-#define ALLOWED_DELAY           TIME_MS2I(2)
+  #define ALLOWED_DELAY             TIME_MS2I(2)
 #endif
 
 /*
  * Maximum number of test threads.
  */
-#define MAX_THREADS             5
+#define MAX_THREADS                 5
 
 /*
  * Stack size of test threads.
  */
-#if defined(PORT_ARCHITECTURE_AVR) || defined(PORT__ARCHITECTURE_MSP430)
-#define THREADS_STACK_SIZE      48
-#elif defined(PORT__ARCHITECTURE_STM8)
-#define THREADS_STACK_SIZE      64
-#elif defined(PORT__ARCHITECTURE_SIMIA32)
-#define THREADS_STACK_SIZE      512
-#else
-#define THREADS_STACK_SIZE      128
+#if !defined(THREADS_STACK_SIZE)
+  #if defined(PORT_ARCHITECTURE_AVR) || defined(PORT__ARCHITECTURE_MSP430)
+    #define THREADS_STACK_SIZE      48
+  #elif defined(PORT__ARCHITECTURE_STM8)
+    #define THREADS_STACK_SIZE      64
+  #elif defined(PORT__ARCHITECTURE_SIMIA32)
+    #define THREADS_STACK_SIZE      512
+  #else
+    #define THREADS_STACK_SIZE      192
+  #endif
 #endif
 
 /*
diff --git a/test/rt/source/test/rt_test_root.h b/test/rt/source/test/rt_test_root.h
index 435019695..1799f32cd 100644
--- a/test/rt/source/test/rt_test_root.h
+++ b/test/rt/source/test/rt_test_root.h
@@ -60,27 +60,29 @@ extern "C" {
  * Allowed delay in timeout checks.
  */
 #if CH_CFG_ST_TIMEDELTA == 0
-#define ALLOWED_DELAY           2
+  #define ALLOWED_DELAY             2
 #else
-#define ALLOWED_DELAY           TIME_MS2I(2)
+  #define ALLOWED_DELAY             TIME_MS2I(2)
 #endif
 
 /*
  * Maximum number of test threads.
  */
-#define MAX_THREADS             5
+#define MAX_THREADS                 5
 
 /*
  * Stack size of test threads.
  */
-#if defined(PORT_ARCHITECTURE_AVR) || defined(PORT__ARCHITECTURE_MSP430)
-#define THREADS_STACK_SIZE      48
-#elif defined(PORT__ARCHITECTURE_STM8)
-#define THREADS_STACK_SIZE      64
-#elif defined(PORT__ARCHITECTURE_SIMIA32)
-#define THREADS_STACK_SIZE      512
-#else
-#define THREADS_STACK_SIZE      128
+#if !defined(THREADS_STACK_SIZE)
+  #if defined(PORT_ARCHITECTURE_AVR) || defined(PORT__ARCHITECTURE_MSP430)
+    #define THREADS_STACK_SIZE      48
+  #elif defined(PORT__ARCHITECTURE_STM8)
+    #define THREADS_STACK_SIZE      64
+  #elif defined(PORT__ARCHITECTURE_SIMIA32)
+    #define THREADS_STACK_SIZE      512
+  #else
+    #define THREADS_STACK_SIZE      192
+  #endif
 #endif
 
 /*