diff --git a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt
index 30bef73..3a163d5 100644
--- a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt
@@ -3,9 +3,15 @@
 
 include(mbed_greentea)
 
+if(MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "MemoryPool test cases require a RTOS to run.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-memorypool
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt
index 496ef6f..c2bbccd 100644
--- a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt
@@ -3,6 +3,14 @@
 
 include(mbed_greentea)
 
+if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run")
+endif()
+
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-basic
@@ -10,4 +18,6 @@
         main.cpp
     HOST_TESTS_DIR
         "${CMAKE_CURRENT_LIST_DIR}/../../host_tests"
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt
index 33028d7..88b79eb 100644
--- a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt
@@ -3,9 +3,19 @@
 
 include(mbed_greentea)
 
+if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "Condition variable test cases require RTOS with multithread to run")
+endif()
+
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-condition-variable
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt
index 5961bb8..e8483f1 100644
--- a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt
@@ -3,9 +3,15 @@
 
 include(mbed_greentea)
 
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-event-flags
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt
index de7dee1..0740eff 100644
--- a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt
@@ -3,9 +3,18 @@
 
 include(mbed_greentea)
 
+if(DEFINED TARGET_CORTEX_A)
+    set(TEST_SKIPPED "test not supported for cortex-A.")
+elseif(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-heap-and-stack
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt
index d548420..62b2bcd 100644
--- a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt
@@ -3,9 +3,19 @@
 
 include(mbed_greentea)
 
+if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "mail test cases require RTOS with multithread to run")
+endif()
+
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-mail
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt
index b82b329..83446e6 100644
--- a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt
@@ -3,9 +3,15 @@
 
 include(mbed_greentea)
 
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-malloc
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt
index 5903f82..4ebc9c2 100644
--- a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt
@@ -3,9 +3,19 @@
 
 include(mbed_greentea)
 
+if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "Mutex test cases require RTOS with multithread to run")
+endif()
+
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-mutex
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt
index 41cd627..7bc1e97 100644
--- a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt
@@ -3,9 +3,19 @@
 
 include(mbed_greentea)
 
+if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "Queue test cases require RTOS with multithread to run")
+endif()
+
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-queue
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt
index 515f402..5bec129 100644
--- a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt
@@ -3,9 +3,15 @@
 
 include(mbed_greentea)
 
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-semaphore
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt
index 7c95f43..9994e48 100644
--- a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt
@@ -3,9 +3,15 @@
 
 include(mbed_greentea)
 
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-signals
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt
index bdf12b8..d330bf2 100644
--- a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt
@@ -3,6 +3,14 @@
 
 include(mbed_greentea)
 
+if(DEFINED MBED_RTOS_SINGLE_THREAD OR MBED_GREENTEA_TEST_BAREMETAL)
+    set(TEST_SKIPPED "RTOS basic test cases require RTOS with multithread to run")
+endif()
+
+if(NOT "DEVICE_USTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "UsTicker need to be enabled for this test.")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-rtos-threads
@@ -10,4 +18,6 @@
         .
     TEST_SOURCES
         main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )