diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 46dce34868..ce1e5ec52c 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -46,7 +46,6 @@ target_include_directories(mbed-headers
 target_include_directories(mbed-stubs-headers
     INTERFACE
         .
-        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub
 )
 
 add_subdirectory(connectivity)
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
index c7a64c87fc..631d84fdd6 100644
--- a/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -11,6 +11,12 @@ target_include_directories(mbed-headers-mbedtls
 
 add_library(mbed-stubs-mbedtls)
 
+target_include_directories(mbed-stubs-mbedtls
+    PUBLIC
+        .
+        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub
+)
+
 target_sources(mbed-stubs-mbedtls
     PRIVATE
         aes_stub.c
diff --git a/UNITTESTS/stubs/aes_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h
similarity index 100%
rename from UNITTESTS/stubs/aes_stub.h
rename to connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.h
diff --git a/UNITTESTS/stubs/cipher_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h
similarity index 100%
rename from UNITTESTS/stubs/cipher_stub.h
rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.h
diff --git a/UNITTESTS/stubs/cmac_stub.h b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h
similarity index 100%
rename from UNITTESTS/stubs/cmac_stub.h
rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.h