diff --git a/libraries/tests/mbed/basic/main.cpp b/libraries/tests/mbed/basic/main.cpp
index d7e45b682a..c4a50988bf 100644
--- a/libraries/tests/mbed/basic/main.cpp
+++ b/libraries/tests/mbed/basic/main.cpp
@@ -1,9 +1,9 @@
 #include "test_env.h"
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Basic);
-    TEST_START("MBED_A1");
-    TEST_RESULT(true);
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Basic);
+    MBED_HOSTTEST_START("MBED_A1");
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/mbed/call_before_main/main.cpp b/libraries/tests/mbed/call_before_main/main.cpp
index 9ab5de4bf3..7b3bac203f 100644
--- a/libraries/tests/mbed/call_before_main/main.cpp
+++ b/libraries/tests/mbed/call_before_main/main.cpp
@@ -10,12 +10,12 @@ extern "C" void mbed_main() {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Call function mbed_main before main);
-    TEST_START("MBED_A21");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Call function mbed_main before main);
+    MBED_HOSTTEST_START("MBED_A21");
 
     printf("MBED: main() starts now!\r\n");
 
-    TEST_RESULT(mbed_main_called);
+    MBED_HOSTTEST_RESULT(mbed_main_called);
 }
diff --git a/libraries/tests/mbed/cpp/main.cpp b/libraries/tests/mbed/cpp/main.cpp
index b565cf0006..48254315a6 100644
--- a/libraries/tests/mbed/cpp/main.cpp
+++ b/libraries/tests/mbed/cpp/main.cpp
@@ -54,10 +54,10 @@ Heap::hello
 Heap::destroy
 *******************/
 int main (void) {
-    TEST_TIMEOUT(10);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(C++);
-    TEST_START("MBED_12");
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(C++);
+    MBED_HOSTTEST_START("MBED_12");
 
     bool result = true;
     for (;;)
@@ -82,5 +82,5 @@ int main (void) {
         break;
     }
 
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/detect/main.cpp b/libraries/tests/mbed/detect/main.cpp
index d7ad0c26dd..1508a13cbf 100644
--- a/libraries/tests/mbed/detect/main.cpp
+++ b/libraries/tests/mbed/detect/main.cpp
@@ -2,14 +2,14 @@
 #include "test_env.h"
 
 int main() {
-    TEST_TIMEOUT(10);
-    TEST_HOSTTEST(detect_auto);
-    TEST_DESCRIPTION(Simple detect test);
-    TEST_START("DTCT_1");
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(detect_auto);
+    MBED_HOSTTEST_DESCRIPTION(Simple detect test);
+    MBED_HOSTTEST_START("DTCT_1");
 
     notify_start();
     printf("MBED: Target '%s'\r\n", TEST_SUITE_TARGET_NAME);
     printf("MBED: Test ID '%s'\r\n", TEST_SUITE_TEST_ID);
     printf("MBED: UUID '%s'\r\n", TEST_SUITE_UUID);
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/mbed/dev_null/main.cpp b/libraries/tests/mbed/dev_null/main.cpp
index 94c6630e62..adde6b8d22 100644
--- a/libraries/tests/mbed/dev_null/main.cpp
+++ b/libraries/tests/mbed/dev_null/main.cpp
@@ -17,14 +17,14 @@ protected:
 DevNull null("null");
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(dev_null_auto);
-    TEST_DESCRIPTION(stdout redirected to dev null);
-    TEST_START("EXAMPLE_1");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(dev_null_auto);
+    MBED_HOSTTEST_DESCRIPTION(stdout redirected to dev null);
+    MBED_HOSTTEST_START("EXAMPLE_1");
     
     printf("MBED: re-routing stdout to /null\r\n");
     freopen("/null", "w", stdout);
     printf("MBED: printf redirected to /null\r\n");   // This shouldn't appear
     // If failure message can be seen test should fail :)
-    TEST_RESULT(false);   // This is 'false' on purpose
+    MBED_HOSTTEST_RESULT(false);   // This is 'false' on purpose
 }
diff --git a/libraries/tests/mbed/digitalin_digitalout/main.cpp b/libraries/tests/mbed/digitalin_digitalout/main.cpp
index dd952faccc..ceb2ae4983 100644
--- a/libraries/tests/mbed/digitalin_digitalout/main.cpp
+++ b/libraries/tests/mbed/digitalin_digitalout/main.cpp
@@ -42,23 +42,23 @@ DigitalIn in(p25);
 #endif
 
 int main() {
-    TEST_TIMEOUT(10);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(DigitalIn DigitalOut);
-    TEST_START("MBED_A5");
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(DigitalIn DigitalOut);
+    MBED_HOSTTEST_START("MBED_A5");
 
     out = 0;
     wait(0.1);
     if (in != 0) {
         printf("ERROR: in != 0\n");
-        TEST_RESULT(false);
+        MBED_HOSTTEST_RESULT(false);
     }
     out = 1;
     wait(0.1);
     if (in != 1) {
         printf("ERROR: in != 1\n");
-        TEST_RESULT(false);
+        MBED_HOSTTEST_RESULT(false);
     }
 
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/mbed/digitalinout/main.cpp b/libraries/tests/mbed/digitalinout/main.cpp
index 2c762b6570..0e6ec9efe3 100644
--- a/libraries/tests/mbed/digitalinout/main.cpp
+++ b/libraries/tests/mbed/digitalinout/main.cpp
@@ -44,10 +44,10 @@ DigitalInOut d2(p25);
 
 int main()
 {
-    TEST_TIMEOUT(10);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(DigitalInOut);
-    TEST_START("MBED_A6");
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(DigitalInOut);
+    MBED_HOSTTEST_START("MBED_A6");
 
     bool check = true;
 
@@ -81,5 +81,5 @@ int main()
         check = false;
     }
 
-    TEST_RESULT(check);
+    MBED_HOSTTEST_RESULT(check);
 }
diff --git a/libraries/tests/mbed/div/main.cpp b/libraries/tests/mbed/div/main.cpp
index fbaa46569a..951e5ab8c5 100644
--- a/libraries/tests/mbed/div/main.cpp
+++ b/libraries/tests/mbed/div/main.cpp
@@ -17,10 +17,10 @@ const char *result_str(bool result) {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Integer constant division);
-    TEST_START("MBED_26");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Integer constant division);
+    MBED_HOSTTEST_START("MBED_26");
 
     bool result = true;
 
@@ -40,5 +40,5 @@ int main() {
         printf("64bit: 0x17FFFFFFE8: expected 0x%lX got 0x%lX ... %s\r\n", values.first, test_ret, result_str(test_res));
     }
 
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/echo/main.cpp b/libraries/tests/mbed/echo/main.cpp
index bbe175b38f..ccd882560c 100644
--- a/libraries/tests/mbed/echo/main.cpp
+++ b/libraries/tests/mbed/echo/main.cpp
@@ -11,10 +11,10 @@ namespace {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(echo);
-    TEST_DESCRIPTION(Serial Echo at 115200);
-    TEST_START("MBED_A9");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(echo);
+    MBED_HOSTTEST_DESCRIPTION(Serial Echo at 115200);
+    MBED_HOSTTEST_START("MBED_A9");
 
     Serial pc(TXPIN, RXPIN);
     pc.baud(115200);
diff --git a/libraries/tests/mbed/env/test_env.h b/libraries/tests/mbed/env/test_env.h
index 4aadae15c9..bfb2c44d2d 100644
--- a/libraries/tests/mbed/env/test_env.h
+++ b/libraries/tests/mbed/env/test_env.h
@@ -29,25 +29,25 @@ void notify_test_id(const char *test_id);
 void notify_test_description(const char *description);
 
 // Host test auto-detection API
-#define TEST_START(TESTID)      notify_test_id(TESTID); notify_start()
-#define TEST_HOSTTEST(NAME)     notify_host_test_name(#NAME)
-#define TEST_TIMEOUT(SECONDS)   notify_timeout(SECONDS)
-#define TEST_DESCRIPTION(DESC)  notify_test_description(#DESC)
-#define TEST_RESULT(RESULT)     notify_completion(RESULT)
+#define MBED_HOSTTEST_START(TESTID)      notify_test_id(TESTID); notify_start()
+#define MBED_HOSTTEST_SELECT(NAME)       notify_host_test_name(#NAME)
+#define MBED_HOSTTEST_TIMEOUT(SECONDS)   notify_timeout(SECONDS)
+#define MBED_HOSTTEST_DESCRIPTION(DESC)  notify_test_description(#DESC)
+#define MBED_HOSTTEST_RESULT(RESULT)     notify_completion(RESULT)
 
 /**
     Test auto-detection preamble example:
     main() {
-        TEST_TIMEOUT(10);
-        TEST_HOSTTEST( host_test );
-        TEST_DESCRIPTION(Hello World);
-        TEST_START("MBED_10");
+        MBED_HOSTTEST_TIMEOUT(10);
+        MBED_HOSTTEST_SELECT( host_test );
+        MBED_HOSTTEST_DESCRIPTION(Hello World);
+        MBED_HOSTTEST_START("MBED_10");
         // Proper 'host_test.py' should take over supervising of this test
 
         // Test code
         bool result = ...;
 
-        TEST_RESULT(result);
+        MBED_HOSTTEST_RESULT(result);
     }
 */
 
diff --git a/libraries/tests/mbed/file/main.cpp b/libraries/tests/mbed/file/main.cpp
index dbe7bbfb47..8f573f4e30 100644
--- a/libraries/tests/mbed/file/main.cpp
+++ b/libraries/tests/mbed/file/main.cpp
@@ -43,10 +43,10 @@ void test_close(FILE *f) {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Semihost file system);
-    TEST_START("MBED_A2");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Semihost file system);
+    MBED_HOSTTEST_START("MBED_A2");
 
     pc.printf("Test the Stream class\n");
 
@@ -74,5 +74,5 @@ int main() {
     test_close(f);
 
     // Check the two strings are equal
-    TEST_RESULT((strncmp(buffer, str, str_len) == 0));
+    MBED_HOSTTEST_RESULT((strncmp(buffer, str, str_len) == 0));
 }
diff --git a/libraries/tests/mbed/hello/main.cpp b/libraries/tests/mbed/hello/main.cpp
index 67f7139e65..9e1e195e9a 100644
--- a/libraries/tests/mbed/hello/main.cpp
+++ b/libraries/tests/mbed/hello/main.cpp
@@ -2,10 +2,10 @@
 
 int main()
 {
-    TEST_TIMEOUT(5);
-    TEST_HOSTTEST(hello_auto);
-    TEST_DESCRIPTION(Hello World);
-    TEST_START("MBED_10");
+    MBED_HOSTTEST_TIMEOUT(5);
+    MBED_HOSTTEST_SELECT(hello_auto);
+    MBED_HOSTTEST_DESCRIPTION(Hello World);
+    MBED_HOSTTEST_START("MBED_10");
 
     printf("Hello World\r\n");
 
diff --git a/libraries/tests/mbed/i2c_MMA8451Q/main.cpp b/libraries/tests/mbed/i2c_MMA8451Q/main.cpp
index 54abe0ac5e..2e17aea5a4 100644
--- a/libraries/tests/mbed/i2c_MMA8451Q/main.cpp
+++ b/libraries/tests/mbed/i2c_MMA8451Q/main.cpp
@@ -29,10 +29,10 @@ float calc_3d_vector_len(float x, float y, float z) {
 #define MEASURE_DEVIATION_TOLERANCE     0.025   // 2.5%
 
 int main(void) {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(MMA8451Q accelerometer);
-    TEST_START("KL25Z_5");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(MMA8451Q accelerometer);
+    MBED_HOSTTEST_START("KL25Z_5");
 
     DigitalOut led(LED_GREEN);
     MMA8451Q acc(SDA, SCL, MMA8451_I2C_ADDRESS);
@@ -52,5 +52,5 @@ int main(void) {
         wait(0.5);
         led = !led;
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/i2c_TMP102/main.cpp b/libraries/tests/mbed/i2c_TMP102/main.cpp
index e76427b601..067dfb7473 100644
--- a/libraries/tests/mbed/i2c_TMP102/main.cpp
+++ b/libraries/tests/mbed/i2c_TMP102/main.cpp
@@ -33,10 +33,10 @@ TMP102 temperature(p28, p27, 0x90);
 #endif
 
 int main() {
-    TEST_TIMEOUT(10);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(DigitalIn DigitalOut);
-    TEST_START("MBED_A4");
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(DigitalIn DigitalOut);
+    MBED_HOSTTEST_START("MBED_A4");
 
     float t = temperature.read();
 
@@ -44,5 +44,5 @@ int main() {
     // In our test environment (ARM office) we should get a temperature within
     // the range ]15, 30[C
     bool result = (t > 15.0) && (t < 30.0);
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/i2c_eeprom/main.cpp b/libraries/tests/mbed/i2c_eeprom/main.cpp
index fc7436c75b..b6825f96ac 100644
--- a/libraries/tests/mbed/i2c_eeprom/main.cpp
+++ b/libraries/tests/mbed/i2c_eeprom/main.cpp
@@ -71,10 +71,10 @@ const int i2c_delay_us = 0;
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(I2C EEPROM read write test);
-    TEST_START("MBED_A19");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(I2C EEPROM read write test);
+    MBED_HOSTTEST_START("MBED_A19");
 
     const int EEPROM_MEM_ADDR = 0xA0;
     const char MARK = 0x66;
@@ -147,5 +147,5 @@ int main() {
         printf("\tTotal failures:  %d\r\n", fw + fr + fc);
     }
 
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/i2c_eeprom_line/main.cpp b/libraries/tests/mbed/i2c_eeprom_line/main.cpp
index 7d3f11cda7..389bfdbcd5 100644
--- a/libraries/tests/mbed/i2c_eeprom_line/main.cpp
+++ b/libraries/tests/mbed/i2c_eeprom_line/main.cpp
@@ -76,10 +76,10 @@ I2C i2c(p28, p27);
 #define PATTERN_MASK 0x66, ~0x66, 0x00, 0xFF, 0xA5, 0x5A, 0xF0, 0x0F
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(I2C EEPROM line read write test);
-    TEST_START("MBED_A25");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(I2C EEPROM line read write test);
+    MBED_HOSTTEST_START("MBED_A25");
 
     const int EEPROM_MEM_ADDR = 0xA0;
     bool result = true;
@@ -138,5 +138,5 @@ int main() {
     printf("EEPROM: Pattern match errors: %d/%d ... [%s]\r\n", pattern_errors, ntests, pattern_errors ? "FAIL" : "OK");
 
     result = write_errors == 0 && read_errors == 0;
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/interruptin/main.cpp b/libraries/tests/mbed/interruptin/main.cpp
index 882c5e7f26..c446b238e7 100644
--- a/libraries/tests/mbed/interruptin/main.cpp
+++ b/libraries/tests/mbed/interruptin/main.cpp
@@ -87,10 +87,10 @@ void flipper() {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(InterruptIn);
-    TEST_START("MBED_A7");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(InterruptIn);
+    MBED_HOSTTEST_START("MBED_A7");
 
     IN_OUT_CLEAR;
     //Test falling edges first
@@ -100,7 +100,7 @@ int main() {
 
     if(checks != 5) {
         printf("MBED: falling edges test failed: %d\r\n",checks);
-        TEST_RESULT(false);
+        MBED_HOSTTEST_RESULT(false);
     }
 
     //Now test rising edges
@@ -110,7 +110,7 @@ int main() {
 
     if (checks != 10) {
         printf("MBED: raising edges test failed: %d\r\n", checks);
-        TEST_RESULT(false);
+        MBED_HOSTTEST_RESULT(false);
     }
 
     //Now test switch off edge detection
@@ -120,7 +120,7 @@ int main() {
 
     if (checks != 10) {
         printf("MBED: edge detection switch off test failed: %d\r\n", checks);
-        TEST_RESULT(false);
+        MBED_HOSTTEST_RESULT(false);
     }
 
     //Finally test both
@@ -130,8 +130,8 @@ int main() {
 
     if (checks != 20) {
         printf("MBED: Simultaneous rising and falling edges failed: %d\r\n", checks);
-        TEST_RESULT(false);
+        MBED_HOSTTEST_RESULT(false);
     }
 
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/mbed/portinout/main.cpp b/libraries/tests/mbed/portinout/main.cpp
index 8f1333e305..c7d64c985e 100644
--- a/libraries/tests/mbed/portinout/main.cpp
+++ b/libraries/tests/mbed/portinout/main.cpp
@@ -91,10 +91,10 @@ PortInOut port1(PORT_1, MASK_1);
 PortInOut port2(PORT_2, MASK_2);
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(PortInOut);
-    TEST_START("MBED_A11");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(PortInOut);
+    MBED_HOSTTEST_START("MBED_A11");
 
     bool check = true;
 
@@ -116,5 +116,5 @@ int main() {
     port2 = 0; wait(0.1);
     if (port1 != 0) check = false;
 
-    TEST_RESULT(check);
+    MBED_HOSTTEST_RESULT(check);
 }
diff --git a/libraries/tests/mbed/portout_portin/main.cpp b/libraries/tests/mbed/portout_portin/main.cpp
index 3797faebb5..7a0a370e0b 100644
--- a/libraries/tests/mbed/portout_portin/main.cpp
+++ b/libraries/tests/mbed/portout_portin/main.cpp
@@ -91,10 +91,10 @@ PortOut port_out(PORT_1, MASK_1);
 PortIn  port_in (PORT_2, MASK_2);
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(PortOut PortIn);
-    TEST_START("MBED_A10");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(PortOut PortIn);
+    MBED_HOSTTEST_START("MBED_A10");
 
     port_out = MASK_1;
     wait(0.1);
diff --git a/libraries/tests/mbed/rtc/main.cpp b/libraries/tests/mbed/rtc/main.cpp
index 3e8a520d41..505e70b5af 100644
--- a/libraries/tests/mbed/rtc/main.cpp
+++ b/libraries/tests/mbed/rtc/main.cpp
@@ -4,10 +4,10 @@
 #define CUSTOM_TIME  1256729737
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(rtc_auto);
-    TEST_DESCRIPTION(RTC);
-    TEST_START("MBED_16");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(rtc_auto);
+    MBED_HOSTTEST_DESCRIPTION(RTC);
+    MBED_HOSTTEST_START("MBED_16");
 
     char buffer[32] = {0};
     set_time(CUSTOM_TIME);  // Set RTC time to Wed, 28 Oct 2009 11:35:37
diff --git a/libraries/tests/mbed/sd/main.cpp b/libraries/tests/mbed/sd/main.cpp
index 0bac9c4aa4..296760957b 100644
--- a/libraries/tests/mbed/sd/main.cpp
+++ b/libraries/tests/mbed/sd/main.cpp
@@ -62,10 +62,10 @@ const int DATA_SIZE = 256;
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(SD File System);
-    TEST_START("MBED_A12");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(SD File System);
+    MBED_HOSTTEST_START("MBED_A12");
 
     uint8_t data_written[DATA_SIZE] = { 0 };
     bool result = false;
@@ -107,5 +107,5 @@ int main() {
     }
 
     result = write_result && read_result;
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/sd_perf_fatfs/main.cpp b/libraries/tests/mbed/sd_perf_fatfs/main.cpp
index 555022de61..df24762e81 100644
--- a/libraries/tests/mbed/sd_perf_fatfs/main.cpp
+++ b/libraries/tests/mbed/sd_perf_fatfs/main.cpp
@@ -125,10 +125,10 @@ char RandomChar() {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(SD FatFS RW Speed);
-    TEST_START("PERF_3");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(SD FatFS RW Speed);
+    MBED_HOSTTEST_START("PERF_3");
 
     // Test header
     printf("\r\n");
@@ -156,5 +156,5 @@ int main() {
         }
         break;
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/sd_perf_fhandle/main.cpp b/libraries/tests/mbed/sd_perf_fhandle/main.cpp
index 292530366f..835dad9b9d 100644
--- a/libraries/tests/mbed/sd_perf_fhandle/main.cpp
+++ b/libraries/tests/mbed/sd_perf_fhandle/main.cpp
@@ -120,10 +120,10 @@ char RandomChar() {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(SD FileHandle RW Speed);
-    TEST_START("PERF_2");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(SD FileHandle RW Speed);
+    MBED_HOSTTEST_START("PERF_2");
 
     // Test header
     printf("\r\n");
@@ -151,5 +151,5 @@ int main() {
         }
         break;
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/sd_perf_stdio/main.cpp b/libraries/tests/mbed/sd_perf_stdio/main.cpp
index 05246cf83e..6da688743a 100644
--- a/libraries/tests/mbed/sd_perf_stdio/main.cpp
+++ b/libraries/tests/mbed/sd_perf_stdio/main.cpp
@@ -120,10 +120,10 @@ char RandomChar() {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(SD stdio RW Speed);
-    TEST_START("PERF_1");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(SD stdio RW Speed);
+    MBED_HOSTTEST_START("PERF_1");
 
     // Test header
     printf("\r\n");
@@ -151,5 +151,5 @@ int main() {
         }
         break;
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/semihost/main.cpp b/libraries/tests/mbed/semihost/main.cpp
index 337c3b4fc6..2ef91d12a4 100644
--- a/libraries/tests/mbed/semihost/main.cpp
+++ b/libraries/tests/mbed/semihost/main.cpp
@@ -6,10 +6,10 @@
 #define MAC_VENDOR_ARM_2    0xF7
 
 int main() {
-    TEST_TIMEOUT(10);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Semihost);
-    TEST_START("MBED_22");
+    MBED_HOSTTEST_TIMEOUT(10);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Semihost);
+    MBED_HOSTTEST_START("MBED_22");
 
     printf("Semihost connected: %s\n", (semihost_connected()) ? ("Yes") : ("No"));
 
@@ -34,5 +34,5 @@ int main() {
         printf("MAC Address Prefix: 00:02:F7, Vendor: ARM\r\n");
     }
 
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/stdio/main.cpp b/libraries/tests/mbed/stdio/main.cpp
index cb80e95d07..0b2445de9b 100644
--- a/libraries/tests/mbed/stdio/main.cpp
+++ b/libraries/tests/mbed/stdio/main.cpp
@@ -7,10 +7,10 @@
  */
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(stdio_auto);
-    TEST_DESCRIPTION(stdio);
-    TEST_START("MBED_2");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(stdio_auto);
+    MBED_HOSTTEST_DESCRIPTION(stdio);
+    MBED_HOSTTEST_START("MBED_2");
 
     DigitalOut led1(LED1);
     DigitalOut led2(LED2);
diff --git a/libraries/tests/mbed/ticker/main.cpp b/libraries/tests/mbed/ticker/main.cpp
index 7a97467e31..fc1ed9ca30 100644
--- a/libraries/tests/mbed/ticker/main.cpp
+++ b/libraries/tests/mbed/ticker/main.cpp
@@ -33,10 +33,10 @@ void flip_2() {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Ticker Int);
-    TEST_START("MBED_11");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Ticker Int);
+    MBED_HOSTTEST_START("MBED_11");
 
     led1 = 0;
     led2 = 0;
diff --git a/libraries/tests/mbed/ticker_2/main.cpp b/libraries/tests/mbed/ticker_2/main.cpp
index fdc55a954a..2509f4e4db 100644
--- a/libraries/tests/mbed/ticker_2/main.cpp
+++ b/libraries/tests/mbed/ticker_2/main.cpp
@@ -27,10 +27,10 @@ void togglePin(void)
 
 int main()
 {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Ticker Int us);
-    TEST_START("MBED_23");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Ticker Int us);
+    MBED_HOSTTEST_START("MBED_23");
 
     tick.attach_us(togglePin, 1000);
 
diff --git a/libraries/tests/mbed/ticker_3/main.cpp b/libraries/tests/mbed/ticker_3/main.cpp
index 0a016c4b1c..a24078eb69 100644
--- a/libraries/tests/mbed/ticker_3/main.cpp
+++ b/libraries/tests/mbed/ticker_3/main.cpp
@@ -32,10 +32,10 @@ void ticker_callback_1(void)
 
 int main(void)
 {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Ticker Two callbacks);
-    TEST_START("MBED_34");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Ticker Two callbacks);
+    MBED_HOSTTEST_START("MBED_34");
 
     ticker.attach(ticker_callback_1, 1.0);
 
diff --git a/libraries/tests/mbed/time_us/main.cpp b/libraries/tests/mbed/time_us/main.cpp
index 4c8fbda77c..18452c8f47 100644
--- a/libraries/tests/mbed/time_us/main.cpp
+++ b/libraries/tests/mbed/time_us/main.cpp
@@ -15,10 +15,10 @@ void print_char(char c = '*')
 
 int main()
 {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Time us);
-    TEST_START("MBED_25");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Time us);
+    MBED_HOSTTEST_START("MBED_25");
 
     while (true) {
         for (int i = 0; i < MS_INTERVALS; i++) {
diff --git a/libraries/tests/mbed/timeout/main.cpp b/libraries/tests/mbed/timeout/main.cpp
index 693438cb25..0dc7ee1ce4 100644
--- a/libraries/tests/mbed/timeout/main.cpp
+++ b/libraries/tests/mbed/timeout/main.cpp
@@ -31,10 +31,10 @@ void toggleOff(void) {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Timeout Int us);
-    TEST_START("MBED_24");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Timeout Int us);
+    MBED_HOSTTEST_START("MBED_24");
 
     toggleOn();
 
diff --git a/libraries/tests/mbed/vtor_reloc/main.cpp b/libraries/tests/mbed/vtor_reloc/main.cpp
index e3e31842e5..e43c179c7a 100644
--- a/libraries/tests/mbed/vtor_reloc/main.cpp
+++ b/libraries/tests/mbed/vtor_reloc/main.cpp
@@ -46,17 +46,17 @@ static bool test_once() {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Interrupt vector relocation);
-    TEST_START("MBED_A18");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Interrupt vector relocation);
+    MBED_HOSTTEST_START("MBED_A18");
 
     // First test, no table reallocation
     {
         printf("Starting first test (interrupts not relocated).\r\n");
         bool ret = test_once();
         if (ret == false) {
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
 
@@ -68,9 +68,9 @@ int main() {
 
         bool ret = test_once();
         if (ret == false) {
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
 
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/net/echo/tcp_client/main.cpp b/libraries/tests/net/echo/tcp_client/main.cpp
index d9fc72d29c..17193f08d0 100644
--- a/libraries/tests/net/echo/tcp_client/main.cpp
+++ b/libraries/tests/net/echo/tcp_client/main.cpp
@@ -10,10 +10,10 @@ struct s_ip_address {
 };
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(tcpecho_client_auto);
-    TEST_DESCRIPTION(TCP echo client);
-    TEST_START("NET_4");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(tcpecho_client_auto);
+    MBED_HOSTTEST_DESCRIPTION(TCP echo client);
+    MBED_HOSTTEST_START("NET_4");
 
     char buffer[256] = {0};
     char out_buffer[] = "Hello World\n";
diff --git a/libraries/tests/net/echo/tcp_client_loop/main.cpp b/libraries/tests/net/echo/tcp_client_loop/main.cpp
index 6fe95bff5f..6c797e7443 100644
--- a/libraries/tests/net/echo/tcp_client_loop/main.cpp
+++ b/libraries/tests/net/echo/tcp_client_loop/main.cpp
@@ -22,10 +22,10 @@ char char_rand() {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(tcpecho_client_auto);
-    TEST_DESCRIPTION(TCP client echo loop);
-    TEST_START("NET_13");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(tcpecho_client_auto);
+    MBED_HOSTTEST_DESCRIPTION(TCP client echo loop);
+    MBED_HOSTTEST_START("NET_13");
 
     char buffer[BUFFER_SIZE] = {0};
     char out_buffer[BUFFER_SIZE] = {0};
@@ -74,5 +74,5 @@ int main() {
     }
     socket.close();
     eth.disconnect();
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/net/echo/tcp_server/main.cpp b/libraries/tests/net/echo/tcp_server/main.cpp
index 04fa0998c2..421fb0dbec 100644
--- a/libraries/tests/net/echo/tcp_server/main.cpp
+++ b/libraries/tests/net/echo/tcp_server/main.cpp
@@ -8,10 +8,10 @@ namespace {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(tcpecho_server_auto);
-    TEST_DESCRIPTION(TCP echo server);
-    TEST_START("NET_3");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(tcpecho_server_auto);
+    MBED_HOSTTEST_DESCRIPTION(TCP echo server);
+    MBED_HOSTTEST_START("NET_3");
 
     char buffer[BUFFER_SIZE] = {0};
     EthernetInterface eth;
diff --git a/libraries/tests/net/echo/udp_client/main.cpp b/libraries/tests/net/echo/udp_client/main.cpp
index 65e2e17896..97f6050508 100644
--- a/libraries/tests/net/echo/udp_client/main.cpp
+++ b/libraries/tests/net/echo/udp_client/main.cpp
@@ -24,10 +24,10 @@ char char_rand() {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(udpecho_client_auto);
-    TEST_DESCRIPTION(UDP echo client);
-    TEST_START("NET_6");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(udpecho_client_auto);
+    MBED_HOSTTEST_DESCRIPTION(UDP echo client);
+    MBED_HOSTTEST_START("NET_6");
 
     char buffer[BUFFER_SIZE] = {0};
     char out_buffer[BUFFER_SIZE] = {0};
@@ -78,5 +78,5 @@ int main() {
 
     socket.close();
     eth.disconnect();
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/net/echo/udp_server/main.cpp b/libraries/tests/net/echo/udp_server/main.cpp
index fa7e6b2c40..ea90ff7d4a 100644
--- a/libraries/tests/net/echo/udp_server/main.cpp
+++ b/libraries/tests/net/echo/udp_server/main.cpp
@@ -8,10 +8,10 @@ namespace {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(udpecho_server_auto);
-    TEST_DESCRIPTION(UDP echo server);
-    TEST_START("NET_5");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(udpecho_server_auto);
+    MBED_HOSTTEST_DESCRIPTION(UDP echo server);
+    MBED_HOSTTEST_START("NET_5");
 
     EthernetInterface eth;
     eth.init(); //Use DHCP
diff --git a/libraries/tests/net/helloworld/tcpclient/main.cpp b/libraries/tests/net/helloworld/tcpclient/main.cpp
index 4d1d05014f..303f547aa1 100644
--- a/libraries/tests/net/helloworld/tcpclient/main.cpp
+++ b/libraries/tests/net/helloworld/tcpclient/main.cpp
@@ -24,10 +24,10 @@ bool find_substring(const char *first, const char *last, const char *s_first, co
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(TCP client hello world);
-    TEST_START("NET_1");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(TCP client hello world);
+    MBED_HOSTTEST_START("NET_1");
 
     bool result = false;
     EthernetInterface eth;
@@ -81,5 +81,5 @@ int main() {
 
     sock.close();
     eth.disconnect();
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/net/helloworld/udpclient/main.cpp b/libraries/tests/net/helloworld/udpclient/main.cpp
index ecf1970e6b..59dad6db6f 100644
--- a/libraries/tests/net/helloworld/udpclient/main.cpp
+++ b/libraries/tests/net/helloworld/udpclient/main.cpp
@@ -10,10 +10,10 @@ namespace {
 
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(NIST Internet Time Service);
-    TEST_START("NET_2");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(NIST Internet Time Service);
+    MBED_HOSTTEST_START("NET_2");
 
     bool result = false;
     EthernetInterface eth;
@@ -52,5 +52,5 @@ int main() {
     }
     sock.close();
     eth.disconnect();
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
 }
diff --git a/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp b/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp
index 7e9417619d..5ab616ea95 100644
--- a/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp
+++ b/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp
@@ -9,10 +9,10 @@ namespace {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(HTTP client hello world);
-    TEST_START("NET_7");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(HTTP client hello world);
+    MBED_HOSTTEST_START("NET_7");
 
     char http_request_buffer[BUFFER_SIZE + 1] = {0};
     HTTPClient http;
@@ -35,7 +35,7 @@ int main() {
 
         if (result == false) {
             eth.disconnect();
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
 
@@ -59,9 +59,9 @@ int main() {
 
         if (result == false) {
             eth.disconnect();
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
     eth.disconnect();
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp b/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp
index c96b5145b0..fa71656b01 100644
--- a/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp
+++ b/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp
@@ -4,10 +4,10 @@
 #include "NTPClient.h"
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(NTP client);
-    TEST_START("NET_8");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(NTP client);
+    MBED_HOSTTEST_START("NET_8");
 
     EthernetInterface eth;
     NTPClient ntp;
@@ -31,9 +31,9 @@ int main() {
         }
 
         if (result == false) {
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
     eth.disconnect();
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
diff --git a/libraries/tests/rtos/mbed/basic/main.cpp b/libraries/tests/rtos/mbed/basic/main.cpp
index 4b286cbbc3..541436786c 100644
--- a/libraries/tests/rtos/mbed/basic/main.cpp
+++ b/libraries/tests/rtos/mbed/basic/main.cpp
@@ -30,10 +30,10 @@ void led2_thread(void const *argument) {
 }
 
 int main() {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Basic thread);
-    TEST_START("RTOS_1");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Basic thread);
+    MBED_HOSTTEST_START("RTOS_1");
 
     Thread thread(led2_thread, NULL, osPriorityNormal, STACK_SIZE);
 
diff --git a/libraries/tests/rtos/mbed/file/main.cpp b/libraries/tests/rtos/mbed/file/main.cpp
index 591732597e..af32f668d6 100644
--- a/libraries/tests/rtos/mbed/file/main.cpp
+++ b/libraries/tests/rtos/mbed/file/main.cpp
@@ -50,7 +50,7 @@ void sd_thread(void const *argument)
             printf("MBED: Done" NL);
         } else {
             printf("MBED: Can't open '%s'" NL, FILE_NAME);
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
 
@@ -71,7 +71,7 @@ void sd_thread(void const *argument)
             printf("MBED: Done\r\n");
         } else {
             printf("MBED: Can't open '%s'" NL, FILE_NAME);
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
 
@@ -79,17 +79,17 @@ void sd_thread(void const *argument)
     for (int i = 0; i < SIZE; i++) {
         if (data_written[i] != data_read[i]) {
             printf("MBED: Data index=%d: w[0x%02X] != r[0x%02X]" NL, i, data_written[i], data_read[i]);
-            TEST_RESULT(false);
+            MBED_HOSTTEST_RESULT(false);
         }
     }
-    TEST_RESULT(true);
+    MBED_HOSTTEST_RESULT(true);
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(SD File write read);
-    TEST_START("RTOS_9");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(SD File write read);
+    MBED_HOSTTEST_START("RTOS_9");
 
     Thread t(sd_thread, NULL, osPriorityNormal, (DEFAULT_STACK_SIZE * 2.25));
 
diff --git a/libraries/tests/rtos/mbed/isr/main.cpp b/libraries/tests/rtos/mbed/isr/main.cpp
index 4dc681f40f..7168564fa9 100644
--- a/libraries/tests/rtos/mbed/isr/main.cpp
+++ b/libraries/tests/rtos/mbed/isr/main.cpp
@@ -36,10 +36,10 @@ void queue_thread(void const *argument) {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(ISR (Queue));
-    TEST_START("RTOS_8");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(ISR (Queue));
+    MBED_HOSTTEST_START("RTOS_8");
 
     Thread thread(queue_thread, NULL, osPriorityNormal, STACK_SIZE);
     Ticker ticker;
@@ -64,6 +64,6 @@ int main (void) {
         }
     }
 
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
     return 0;
 }
diff --git a/libraries/tests/rtos/mbed/mail/main.cpp b/libraries/tests/rtos/mbed/mail/main.cpp
index 9a0e200db7..105d3eafbf 100644
--- a/libraries/tests/rtos/mbed/mail/main.cpp
+++ b/libraries/tests/rtos/mbed/mail/main.cpp
@@ -40,10 +40,10 @@ void send_thread (void const *argument) {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Mail messaging);
-    TEST_START("RTOS_6");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Mail messaging);
+    MBED_HOSTTEST_START("RTOS_6");
 
     Thread thread(send_thread, NULL, osPriorityNormal, STACK_SIZE);
     bool result = true;
@@ -70,6 +70,6 @@ int main (void) {
             }
         }
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
     return 0;
 }
diff --git a/libraries/tests/rtos/mbed/mutex/main.cpp b/libraries/tests/rtos/mbed/mutex/main.cpp
index fa85e87936..80d49a189c 100644
--- a/libraries/tests/rtos/mbed/mutex/main.cpp
+++ b/libraries/tests/rtos/mbed/mutex/main.cpp
@@ -59,10 +59,10 @@ void test_thread(void const *args) {
 }
 
 int main() {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default);
-    TEST_DESCRIPTION(Mutex resource lock);
-    TEST_START("RTOS_2");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default);
+    MBED_HOSTTEST_DESCRIPTION(Mutex resource lock);
+    MBED_HOSTTEST_START("RTOS_2");
 
     const int t1_delay = THREAD_DELAY * 1;
     const int t2_delay = THREAD_DELAY * 2;
@@ -82,6 +82,6 @@ int main() {
     }
 
     fflush(stdout);
-    TEST_RESULT(!mutex_defect);
+    MBED_HOSTTEST_RESULT(!mutex_defect);
     return 0;
 }
diff --git a/libraries/tests/rtos/mbed/queue/main.cpp b/libraries/tests/rtos/mbed/queue/main.cpp
index 713cff76f5..4f794bc4b8 100644
--- a/libraries/tests/rtos/mbed/queue/main.cpp
+++ b/libraries/tests/rtos/mbed/queue/main.cpp
@@ -42,10 +42,10 @@ void send_thread (void const *argument) {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Queue messaging);
-    TEST_START("RTOS_5");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Queue messaging);
+    MBED_HOSTTEST_START("RTOS_5");
 
     Thread thread(send_thread, NULL, osPriorityNormal, STACK_SIZE);
     bool result = true;
@@ -72,6 +72,6 @@ int main (void) {
             }
         }
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
     return 0;
 }
diff --git a/libraries/tests/rtos/mbed/semaphore/main.cpp b/libraries/tests/rtos/mbed/semaphore/main.cpp
index 1021e7e97d..1f35e9f473 100644
--- a/libraries/tests/rtos/mbed/semaphore/main.cpp
+++ b/libraries/tests/rtos/mbed/semaphore/main.cpp
@@ -48,10 +48,10 @@ void test_thread(void const *delay) {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Semaphore resource lock);
-    TEST_START("RTOS_3");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Semaphore resource lock);
+    MBED_HOSTTEST_START("RTOS_3");
 
     const int t1_delay = THREAD_DELAY * 1;
     const int t2_delay = THREAD_DELAY * 2;
@@ -70,6 +70,6 @@ int main (void) {
     }
 
     fflush(stdout);
-    TEST_RESULT(!sem_defect);
+    MBED_HOSTTEST_RESULT(!sem_defect);
     return 0;
 }
diff --git a/libraries/tests/rtos/mbed/signals/main.cpp b/libraries/tests/rtos/mbed/signals/main.cpp
index 9b13fe71e5..aefe72f93d 100644
--- a/libraries/tests/rtos/mbed/signals/main.cpp
+++ b/libraries/tests/rtos/mbed/signals/main.cpp
@@ -30,10 +30,10 @@ void led_thread(void const *argument) {
 }
 
 int main (void) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Signals messaging);
-    TEST_START("RTOS_4");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Signals messaging);
+    MBED_HOSTTEST_START("RTOS_4");
 
     Thread thread(led_thread, NULL, osPriorityNormal, STACK_SIZE);
     bool result = true;
@@ -46,6 +46,6 @@ int main (void) {
             break;
         }
     }
-    TEST_RESULT(result);
+    MBED_HOSTTEST_RESULT(result);
     return 0;
 }
diff --git a/libraries/tests/rtos/mbed/timer/main.cpp b/libraries/tests/rtos/mbed/timer/main.cpp
index 98fda731cf..3c33551b0a 100644
--- a/libraries/tests/rtos/mbed/timer/main.cpp
+++ b/libraries/tests/rtos/mbed/timer/main.cpp
@@ -23,10 +23,10 @@ void blink(void const *n) {
 }
 
 int main(void) {
-    TEST_TIMEOUT(15);
-    TEST_HOSTTEST(wait_us_auto);
-    TEST_DESCRIPTION(Timer);
-    TEST_START("RTOS_7");
+    MBED_HOSTTEST_TIMEOUT(15);
+    MBED_HOSTTEST_SELECT(wait_us_auto);
+    MBED_HOSTTEST_DESCRIPTION(Timer);
+    MBED_HOSTTEST_START("RTOS_7");
 
     RtosTimer led_1_timer(blink, osTimerPeriodic, (void *)0);
     RtosTimer led_2_timer(blink, osTimerPeriodic, (void *)1);
diff --git a/libraries/tests/utest/testrunner/testrunner.cpp b/libraries/tests/utest/testrunner/testrunner.cpp
index 92154bed49..2c1969ce07 100644
--- a/libraries/tests/utest/testrunner/testrunner.cpp
+++ b/libraries/tests/utest/testrunner/testrunner.cpp
@@ -11,10 +11,10 @@ It is declared in \cpputest\src\Platforms\armcc\UtestPlatform.cpp
 Serial mbed_cpputest_console(STDIO_UART_TX, STDIO_UART_RX);
 
 int main(int ac, char** av) {
-    TEST_TIMEOUT(20);
-    TEST_HOSTTEST(default_auto);
-    TEST_DESCRIPTION(Unit test);
-    TEST_START("UT");
+    MBED_HOSTTEST_TIMEOUT(20);
+    MBED_HOSTTEST_SELECT(default_auto);
+    MBED_HOSTTEST_DESCRIPTION(Unit test);
+    MBED_HOSTTEST_START("UT");
 
     unsigned failureCount = 0;
     {
@@ -24,6 +24,6 @@ int main(int ac, char** av) {
         failureCount = CommandLineTestRunner::RunAllTests(ac, av);
     }
 
-    TEST_RESULT(failureCount == 0);
+    MBED_HOSTTEST_RESULT(failureCount == 0);
     return failureCount;
 }