diff --git a/core/mbed-rtos/TESTS/mbed-rtos/basic/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/basic/main.cpp
index 6f0f23597b..1b885f9990 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/basic/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/basic/main.cpp
@@ -34,10 +34,7 @@ void led2_thread(void const *argument) {
 }
 
 int main() {
-    MBED_HOSTTEST_TIMEOUT(15);
-    MBED_HOSTTEST_SELECT(wait_us_auto);
-    MBED_HOSTTEST_DESCRIPTION(Basic thread);
-    MBED_HOSTTEST_START("RTOS_1");
+    GREENTEA_SETUP(15, "wait_us_auto");
 
     Thread thread(led2_thread, NULL, osPriorityNormal, STACK_SIZE);
 
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/isr/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/isr/main.cpp
index 346152ec8e..0bc2f5c215 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/isr/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/isr/main.cpp
@@ -38,10 +38,7 @@ void queue_thread(void const *argument) {
 }
 
 int main (void) {
-    MBED_HOSTTEST_TIMEOUT(20);
-    MBED_HOSTTEST_SELECT(default_auto);
-    MBED_HOSTTEST_DESCRIPTION(ISR (Queue));
-    MBED_HOSTTEST_START("RTOS_8");
+    GREENTEA_SETUP(20, "default_auto");
 
     Thread thread(queue_thread, NULL, osPriorityNormal, STACK_SIZE);
     Ticker ticker;
@@ -66,6 +63,6 @@ int main (void) {
         }
     }
 
-    MBED_HOSTTEST_RESULT(result);
+    GREENTEA_TESTSUITE_RESULT(result);
     return 0;
 }
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/mail/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/mail/main.cpp
index 35d02fa70d..674bbdbc93 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/mail/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/mail/main.cpp
@@ -44,10 +44,7 @@ void send_thread (void const *argument) {
 }
 
 int main (void) {
-    MBED_HOSTTEST_TIMEOUT(20);
-    MBED_HOSTTEST_SELECT(default_auto);
-    MBED_HOSTTEST_DESCRIPTION(Mail messaging);
-    MBED_HOSTTEST_START("RTOS_6");
+    GREENTEA_SETUP(20, "default_auto");
 
     Thread thread(send_thread, NULL, osPriorityNormal, STACK_SIZE);
     bool result = true;
@@ -74,6 +71,6 @@ int main (void) {
             }
         }
     }
-    MBED_HOSTTEST_RESULT(result);
+    GREENTEA_TESTSUITE_RESULT(result);
     return 0;
 }
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/mutex/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/mutex/main.cpp
index 17d99867ce..abcfe85535 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/mutex/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/mutex/main.cpp
@@ -73,11 +73,7 @@ void test_thread(void const *args) {
 }
 
 int main() {
-    MBED_HOSTTEST_TIMEOUT(20);
-    MBED_HOSTTEST_SELECT(default);
-    MBED_HOSTTEST_DESCRIPTION(Mutex resource lock);
-    MBED_HOSTTEST_START("RTOS_2");
-
+    GREENTEA_SETUP(20, "default_auto");
     const int t1_delay = THREAD_DELAY * 1;
     const int t2_delay = THREAD_DELAY * 2;
     const int t3_delay = THREAD_DELAY * 3;
@@ -96,6 +92,6 @@ int main() {
     }
 
     fflush(stdout);
-    MBED_HOSTTEST_RESULT(!mutex_defect);
+    GREENTEA_TESTSUITE_RESULT(!mutex_defect);
     return 0;
 }
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/queue/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/queue/main.cpp
index f9a5361020..2ddc5a748a 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/queue/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/queue/main.cpp
@@ -46,10 +46,7 @@ void send_thread (void const *argument) {
 }
 
 int main (void) {
-    MBED_HOSTTEST_TIMEOUT(20);
-    MBED_HOSTTEST_SELECT(default_auto);
-    MBED_HOSTTEST_DESCRIPTION(Queue messaging);
-    MBED_HOSTTEST_START("RTOS_5");
+    GREENTEA_SETUP(20, "default_auto");
 
     Thread thread(send_thread, NULL, osPriorityNormal, STACK_SIZE);
     bool result = true;
@@ -76,6 +73,6 @@ int main (void) {
             }
         }
     }
-    MBED_HOSTTEST_RESULT(result);
+    GREENTEA_TESTSUITE_RESULT(result);
     return 0;
 }
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/semaphore/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/semaphore/main.cpp
index 51534c7bbd..4b82963984 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/semaphore/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/semaphore/main.cpp
@@ -64,10 +64,7 @@ void test_thread(void const *delay) {
 }
 
 int main (void) {
-    MBED_HOSTTEST_TIMEOUT(20);
-    MBED_HOSTTEST_SELECT(default_auto);
-    MBED_HOSTTEST_DESCRIPTION(Semaphore resource lock);
-    MBED_HOSTTEST_START("RTOS_3");
+    GREENTEA_SETUP(20, "default_auto");
 
     const int t1_delay = THREAD_DELAY * 1;
     const int t2_delay = THREAD_DELAY * 2;
@@ -86,6 +83,6 @@ int main (void) {
     }
 
     fflush(stdout);
-    MBED_HOSTTEST_RESULT(!sem_defect);
+    GREENTEA_TESTSUITE_RESULT(!sem_defect);
     return 0;
 }
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/signals/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/signals/main.cpp
index 00808c3405..7658cfad8d 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/signals/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/signals/main.cpp
@@ -32,10 +32,7 @@ void led_thread(void const *argument) {
 }
 
 int main (void) {
-    MBED_HOSTTEST_TIMEOUT(20);
-    MBED_HOSTTEST_SELECT(default_auto);
-    MBED_HOSTTEST_DESCRIPTION(Signals messaging);
-    MBED_HOSTTEST_START("RTOS_4");
+    GREENTEA_SETUP(20, "default_auto");
 
     Thread thread(led_thread, NULL, osPriorityNormal, STACK_SIZE);
     bool result = true;
@@ -48,6 +45,6 @@ int main (void) {
             break;
         }
     }
-    MBED_HOSTTEST_RESULT(result);
+    GREENTEA_TESTSUITE_RESULT(result);
     return 0;
 }
diff --git a/core/mbed-rtos/TESTS/mbed-rtos/timer/main.cpp b/core/mbed-rtos/TESTS/mbed-rtos/timer/main.cpp
index 3c33551b0a..d0f4cf51b8 100644
--- a/core/mbed-rtos/TESTS/mbed-rtos/timer/main.cpp
+++ b/core/mbed-rtos/TESTS/mbed-rtos/timer/main.cpp
@@ -23,10 +23,7 @@ void blink(void const *n) {
 }
 
 int main(void) {
-    MBED_HOSTTEST_TIMEOUT(15);
-    MBED_HOSTTEST_SELECT(wait_us_auto);
-    MBED_HOSTTEST_DESCRIPTION(Timer);
-    MBED_HOSTTEST_START("RTOS_7");
+    GREENTEA_SETUP(15, "wait_us_auto");
 
     RtosTimer led_1_timer(blink, osTimerPeriodic, (void *)0);
     RtosTimer led_2_timer(blink, osTimerPeriodic, (void *)1);