diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
index ceaef136d7..c6a83768d5 100644
--- a/TESTS/configs/baremetal.json
+++ b/TESTS/configs/baremetal.json
@@ -5,7 +5,6 @@
         "utest",
         "unity",
         "psa",
-        "mbed-crypto",
         "mbedtls",
         "psa-compliance-framework",
         "filesystem",
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 52f46f5f9d..b6b1d6b6af 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -144,7 +144,6 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
-  "${PROJECT_SOURCE_DIR}/../features/mbedtls/mbed-crypto/inc"
   "${PROJECT_SOURCE_DIR}/../features/storage/kvstore/conf"
 )
 
diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
index 78bb6577db..6c0a6d96f9 100644
--- a/UNITTESTS/empty_baseline/unittest.cmake
+++ b/UNITTESTS/empty_baseline/unittest.cmake
@@ -6,7 +6,7 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/mbedtls/mbed-crypto/inc/mbedtls/
+  ../features/mbedtls/inc/mbedtls/
   ../features/mbedtls/platform/inc/
   ../features/frameworks/mbed-trace/mbed-trace/
 )
diff --git a/components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json b/components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json
index 9e4db97006..ac6c485773 100644
--- a/components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json
+++ b/components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json
@@ -4,7 +4,6 @@
         "drivers",
         "platform",
         "mbedtls",
-        "mbed-crypto",
         "storage",
         "flashiap-block-device",
         "tdbstore",