diff --git a/TESTS/mbed_drivers/buffered_serial/main.cpp b/drivers/tests/TESTS/mbed_drivers/buffered_serial/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/buffered_serial/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/buffered_serial/main.cpp
diff --git a/TESTS/mbed_drivers/c_strings/main.cpp b/drivers/tests/TESTS/mbed_drivers/c_strings/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/c_strings/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/c_strings/main.cpp
diff --git a/TESTS/mbed_drivers/crc/main.cpp b/drivers/tests/TESTS/mbed_drivers/crc/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/crc/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/crc/main.cpp
diff --git a/TESTS/mbed_drivers/dev_null/main.cpp b/drivers/tests/TESTS/mbed_drivers/dev_null/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/dev_null/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/dev_null/main.cpp
diff --git a/TESTS/mbed_drivers/echo/main.cpp b/drivers/tests/TESTS/mbed_drivers/echo/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/echo/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/echo/main.cpp
diff --git a/TESTS/mbed_drivers/flashiap/main.cpp b/drivers/tests/TESTS/mbed_drivers/flashiap/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/flashiap/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/flashiap/main.cpp
diff --git a/TESTS/mbed_drivers/generic_tests/main.cpp b/drivers/tests/TESTS/mbed_drivers/generic_tests/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/generic_tests/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/generic_tests/main.cpp
diff --git a/TESTS/mbed_drivers/lp_ticker/main.cpp b/drivers/tests/TESTS/mbed_drivers/lp_ticker/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/lp_ticker/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/lp_ticker/main.cpp
diff --git a/TESTS/mbed_drivers/lp_timeout/main.cpp b/drivers/tests/TESTS/mbed_drivers/lp_timeout/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/lp_timeout/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/lp_timeout/main.cpp
diff --git a/TESTS/mbed_drivers/lp_timer/main.cpp b/drivers/tests/TESTS/mbed_drivers/lp_timer/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/lp_timer/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/lp_timer/main.cpp
diff --git a/TESTS/mbed_drivers/mem_trace/main.cpp b/drivers/tests/TESTS/mbed_drivers/mem_trace/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/mem_trace/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/mem_trace/main.cpp
diff --git a/TESTS/mbed_drivers/race_test/main.cpp b/drivers/tests/TESTS/mbed_drivers/race_test/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/race_test/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/race_test/main.cpp
diff --git a/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h b/drivers/tests/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
similarity index 100%
rename from TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
rename to drivers/tests/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
diff --git a/TESTS/mbed_drivers/reset_reason/main.cpp b/drivers/tests/TESTS/mbed_drivers/reset_reason/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/reset_reason/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/reset_reason/main.cpp
diff --git a/TESTS/mbed_drivers/rtc/main.cpp b/drivers/tests/TESTS/mbed_drivers/rtc/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/rtc/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/rtc/main.cpp
diff --git a/TESTS/mbed_drivers/sleep_lock/main.cpp b/drivers/tests/TESTS/mbed_drivers/sleep_lock/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/sleep_lock/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/sleep_lock/main.cpp
diff --git a/TESTS/mbed_drivers/stl_features/main.cpp b/drivers/tests/TESTS/mbed_drivers/stl_features/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/stl_features/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/stl_features/main.cpp
diff --git a/TESTS/mbed_drivers/ticker/main.cpp b/drivers/tests/TESTS/mbed_drivers/ticker/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/ticker/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/ticker/main.cpp
diff --git a/TESTS/mbed_drivers/timeout/main.cpp b/drivers/tests/TESTS/mbed_drivers/timeout/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/timeout/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/timeout/main.cpp
diff --git a/TESTS/mbed_drivers/timeout/timeout_tests.h b/drivers/tests/TESTS/mbed_drivers/timeout/timeout_tests.h
similarity index 100%
rename from TESTS/mbed_drivers/timeout/timeout_tests.h
rename to drivers/tests/TESTS/mbed_drivers/timeout/timeout_tests.h
diff --git a/TESTS/mbed_drivers/timer/main.cpp b/drivers/tests/TESTS/mbed_drivers/timer/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/timer/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/timer/main.cpp
diff --git a/TESTS/mbed_drivers/timerevent/main.cpp b/drivers/tests/TESTS/mbed_drivers/timerevent/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/timerevent/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/timerevent/main.cpp
diff --git a/TESTS/mbed_drivers/unbuffered_serial/main.cpp b/drivers/tests/TESTS/mbed_drivers/unbuffered_serial/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/unbuffered_serial/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/unbuffered_serial/main.cpp
diff --git a/TESTS/mbed_drivers/watchdog/Watchdog_tests.h b/drivers/tests/TESTS/mbed_drivers/watchdog/Watchdog_tests.h
similarity index 100%
rename from TESTS/mbed_drivers/watchdog/Watchdog_tests.h
rename to drivers/tests/TESTS/mbed_drivers/watchdog/Watchdog_tests.h
diff --git a/TESTS/mbed_drivers/watchdog/main.cpp b/drivers/tests/TESTS/mbed_drivers/watchdog/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/watchdog/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/watchdog/main.cpp
diff --git a/TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_tests.h b/drivers/tests/TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_tests.h
similarity index 100%
rename from TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_tests.h
rename to drivers/tests/TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_tests.h
diff --git a/TESTS/mbed_drivers/watchdog_reset/main.cpp b/drivers/tests/TESTS/mbed_drivers/watchdog_reset/main.cpp
similarity index 100%
rename from TESTS/mbed_drivers/watchdog_reset/main.cpp
rename to drivers/tests/TESTS/mbed_drivers/watchdog_reset/main.cpp