diff --git a/TESTS/mbed_drivers/callback/main.cpp b/TESTS/mbed_drivers/callback/main.cpp
index 90fdd1af1c..7d229fa7a3 100644
--- a/TESTS/mbed_drivers/callback/main.cpp
+++ b/TESTS/mbed_drivers/callback/main.cpp
@@ -1,5 +1,5 @@
 #include "mbed.h"
-#include "test_env.h"
+#include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
 
@@ -230,7 +230,7 @@ void test_fparg0() {
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(40, "default_auto");
+    GREENTEA_SETUP(5, "default_auto");
     return verbose_test_setup_handler(number_of_cases);
 }
 
diff --git a/TESTS/mbedmicro-mbed/attributes/main.cpp b/TESTS/mbedmicro-mbed/attributes/main.cpp
index 1a0feb99ae..c006e904db 100644
--- a/TESTS/mbedmicro-mbed/attributes/main.cpp
+++ b/TESTS/mbedmicro-mbed/attributes/main.cpp
@@ -2,7 +2,7 @@
 #include <stdint.h>
 
 #include "toolchain.h"
-#include "test_env.h"
+#include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
 
@@ -30,7 +30,7 @@ void test_wrapper() {
 }
 
 utest::v1::status_t test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(40, "default_auto");
+    GREENTEA_SETUP(5, "default_auto");
     return verbose_test_setup_handler(number_of_cases);
 }
 
diff --git a/TESTS/mbedmicro-rtos-mbed/threads/main.cpp b/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
index 555a2a1bfe..d3f8acc18f 100644
--- a/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
@@ -1,5 +1,5 @@
 #include "mbed.h"
-#include "test_env.h"
+#include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
 #include "rtos.h"