diff --git a/TESTS/mbedtls/multi/main.cpp b/connectivity/mbedtls/tests/TESTS/mbedtls/multi/main.cpp
similarity index 100%
rename from TESTS/mbedtls/multi/main.cpp
rename to connectivity/mbedtls/tests/TESTS/mbedtls/multi/main.cpp
diff --git a/TESTS/mbedtls/sanity/main.cpp b/connectivity/mbedtls/tests/TESTS/mbedtls/sanity/main.cpp
similarity index 100%
rename from TESTS/mbedtls/sanity/main.cpp
rename to connectivity/mbedtls/tests/TESTS/mbedtls/sanity/main.cpp
diff --git a/TESTS/mbedtls/selftest/main.cpp b/connectivity/mbedtls/tests/TESTS/mbedtls/selftest/main.cpp
similarity index 100%
rename from TESTS/mbedtls/selftest/main.cpp
rename to connectivity/mbedtls/tests/TESTS/mbedtls/selftest/main.cpp