diff --git a/libraries/tests/rtos/cmsis/basic/main.cpp b/libraries/tests/rtos/cmsis/basic/main.cpp
index d78a49fcf6..b8177e8fa4 100644
--- a/libraries/tests/rtos/cmsis/basic/main.cpp
+++ b/libraries/tests/rtos/cmsis/basic/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 DigitalOut led1(LED1);
 DigitalOut led2(LED2);
 
diff --git a/libraries/tests/rtos/cmsis/isr/main.cpp b/libraries/tests/rtos/cmsis/isr/main.cpp
index 52c7da3d8c..41bcaaf54f 100644
--- a/libraries/tests/rtos/cmsis/isr/main.cpp
+++ b/libraries/tests/rtos/cmsis/isr/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 Queue<uint32_t, 5> queue;
 
 DigitalOut myled(LED1);
diff --git a/libraries/tests/rtos/cmsis/mail/main.cpp b/libraries/tests/rtos/cmsis/mail/main.cpp
index 545fca34c7..6273a81210 100644
--- a/libraries/tests/rtos/cmsis/mail/main.cpp
+++ b/libraries/tests/rtos/cmsis/mail/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 typedef struct {
   float    voltage; /* AD result of measured voltage */
   float    current; /* AD result of measured current */
diff --git a/libraries/tests/rtos/cmsis/mutex/main.cpp b/libraries/tests/rtos/cmsis/mutex/main.cpp
index ccd1a603ca..8c0e4f516c 100644
--- a/libraries/tests/rtos/cmsis/mutex/main.cpp
+++ b/libraries/tests/rtos/cmsis/mutex/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 osMutexId stdio_mutex;
 osMutexDef(stdio_mutex);
 
diff --git a/libraries/tests/rtos/cmsis/queue/main.cpp b/libraries/tests/rtos/cmsis/queue/main.cpp
index 1c6eab2f39..aab3200704 100644
--- a/libraries/tests/rtos/cmsis/queue/main.cpp
+++ b/libraries/tests/rtos/cmsis/queue/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 typedef struct {
     float    voltage;   /* AD result of measured voltage */
     float    current;   /* AD result of measured current */
diff --git a/libraries/tests/rtos/cmsis/semaphore/main.cpp b/libraries/tests/rtos/cmsis/semaphore/main.cpp
index d4b473c187..53660b9a6d 100644
--- a/libraries/tests/rtos/cmsis/semaphore/main.cpp
+++ b/libraries/tests/rtos/cmsis/semaphore/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 osSemaphoreId two_slots;
 osSemaphoreDef(two_slots);
 
diff --git a/libraries/tests/rtos/cmsis/signals/main.cpp b/libraries/tests/rtos/cmsis/signals/main.cpp
index 14ce05dadb..de01825f91 100644
--- a/libraries/tests/rtos/cmsis/signals/main.cpp
+++ b/libraries/tests/rtos/cmsis/signals/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 DigitalOut led(LED1);
 
 void led_thread(void const *argument) {
diff --git a/libraries/tests/rtos/cmsis/timer/main.cpp b/libraries/tests/rtos/cmsis/timer/main.cpp
index a0b093f946..2aba393c1d 100644
--- a/libraries/tests/rtos/cmsis/timer/main.cpp
+++ b/libraries/tests/rtos/cmsis/timer/main.cpp
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "cmsis_os.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 DigitalOut LEDs[4] = {
     DigitalOut(LED1), DigitalOut(LED2), DigitalOut(LED3), DigitalOut(LED4)
 };
diff --git a/libraries/tests/rtos/mbed/basic/main.cpp b/libraries/tests/rtos/mbed/basic/main.cpp
index 5ad41b661d..038cf05b6a 100644
--- a/libraries/tests/rtos/mbed/basic/main.cpp
+++ b/libraries/tests/rtos/mbed/basic/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 /*
  * The stack size is defined in cmsis_os.h mainly dependent on the underlying toolchain and
  * the C standard library. For GCC, ARM_STD and IAR it is defined with a size of 2048 bytes
diff --git a/libraries/tests/rtos/mbed/file/main.cpp b/libraries/tests/rtos/mbed/file/main.cpp
index af32f668d6..f2046e890f 100644
--- a/libraries/tests/rtos/mbed/file/main.cpp
+++ b/libraries/tests/rtos/mbed/file/main.cpp
@@ -3,6 +3,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 DigitalOut led2(LED2);
 
 #define SIZE 100
diff --git a/libraries/tests/rtos/mbed/isr/main.cpp b/libraries/tests/rtos/mbed/isr/main.cpp
index da89bccab8..ae27fa6b8f 100644
--- a/libraries/tests/rtos/mbed/isr/main.cpp
+++ b/libraries/tests/rtos/mbed/isr/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 #define QUEUE_SIZE              5
 #define THREAD_DELAY            250
 #define QUEUE_PUT_ISR_VALUE     128
diff --git a/libraries/tests/rtos/mbed/mail/main.cpp b/libraries/tests/rtos/mbed/mail/main.cpp
index 3e7e0f0ea1..d609afadcd 100644
--- a/libraries/tests/rtos/mbed/mail/main.cpp
+++ b/libraries/tests/rtos/mbed/mail/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 typedef struct {
     float    voltage;   /* AD result of measured voltage */
     float    current;   /* AD result of measured current */
diff --git a/libraries/tests/rtos/mbed/mutex/main.cpp b/libraries/tests/rtos/mbed/mutex/main.cpp
index 7edd0a6ccf..4d77f47f70 100644
--- a/libraries/tests/rtos/mbed/mutex/main.cpp
+++ b/libraries/tests/rtos/mbed/mutex/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 #define THREAD_DELAY     50
 #define SIGNALS_TO_EMIT  100
 
diff --git a/libraries/tests/rtos/mbed/queue/main.cpp b/libraries/tests/rtos/mbed/queue/main.cpp
index e44021f392..2a44e84b2d 100644
--- a/libraries/tests/rtos/mbed/queue/main.cpp
+++ b/libraries/tests/rtos/mbed/queue/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 typedef struct {
     float    voltage;   /* AD result of measured voltage */
     float    current;   /* AD result of measured current */
diff --git a/libraries/tests/rtos/mbed/semaphore/main.cpp b/libraries/tests/rtos/mbed/semaphore/main.cpp
index cc57aca08e..2c38d453af 100644
--- a/libraries/tests/rtos/mbed/semaphore/main.cpp
+++ b/libraries/tests/rtos/mbed/semaphore/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 #define THREAD_DELAY     75
 #define SEMAPHORE_SLOTS  2
 #define SEM_CHANGES      100
diff --git a/libraries/tests/rtos/mbed/signals/main.cpp b/libraries/tests/rtos/mbed/signals/main.cpp
index 51bff164f2..bbbe1cd70e 100644
--- a/libraries/tests/rtos/mbed/signals/main.cpp
+++ b/libraries/tests/rtos/mbed/signals/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 #define SIGNALS_TO_EMIT     100
 #define SIGNAL_HANDLE_DELEY 25
 #define SIGNAL_SET_VALUE    0x01
diff --git a/libraries/tests/rtos/mbed/timer/main.cpp b/libraries/tests/rtos/mbed/timer/main.cpp
index 3c33551b0a..761bf27fed 100644
--- a/libraries/tests/rtos/mbed/timer/main.cpp
+++ b/libraries/tests/rtos/mbed/timer/main.cpp
@@ -2,6 +2,10 @@
 #include "test_env.h"
 #include "rtos.h"
 
+#if defined(MBED_RTOS_SINGLE_THREAD)
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 DigitalOut LEDs[4] = {
     DigitalOut(LED1), DigitalOut(LED2), DigitalOut(LED3), DigitalOut(LED4)
 };