diff --git a/TESTS/mbed_drivers/lp_ticker/main.cpp b/TESTS/mbed_drivers/lp_ticker/main.cpp
index b09c485850..425c5b9a38 100644
--- a/TESTS/mbed_drivers/lp_ticker/main.cpp
+++ b/TESTS/mbed_drivers/lp_ticker/main.cpp
@@ -218,7 +218,7 @@ Case cases[] = {
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(test_timeout, "timing_drift_auto");
+    GREENTEA_SETUP(test_timeout, "default_auto");
     return utest::v1::greentea_test_setup_handler(number_of_cases);
 }
 
diff --git a/TESTS/mbed_hal/critical_section/main.cpp b/TESTS/mbed_hal/critical_section/main.cpp
index b380972858..22f543fb38 100644
--- a/TESTS/mbed_hal/critical_section/main.cpp
+++ b/TESTS/mbed_hal/critical_section/main.cpp
@@ -69,7 +69,7 @@ Case cases[] = {
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(10, "timing_drift_auto");
+    GREENTEA_SETUP(10, "default_auto");
     return utest::v1::greentea_test_setup_handler(number_of_cases);
 }
 
diff --git a/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp b/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
index 9f5eb6eabe..ceeca2a50f 100644
--- a/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
@@ -107,7 +107,7 @@ Case cases[] = {
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(10, "timing_drift_auto");
+    GREENTEA_SETUP(10, "default_auto");
     return utest::v1::greentea_test_setup_handler(number_of_cases);
 }
 
diff --git a/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp b/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
index d6125ee020..4aa81a152d 100644
--- a/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
@@ -211,7 +211,7 @@ Case cases[] = {
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(test_timeout, "timing_drift_auto");
+    GREENTEA_SETUP(test_timeout, "default_auto");
     return utest::v1::greentea_test_setup_handler(number_of_cases);
 }