diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
index 895212b08e..df8dbd5bf3 100644
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -18,12 +18,8 @@ target_compile_definitions(mbed-stubs-connectivity
 
 target_sources(mbed-stubs-connectivity
     PRIVATE
-        aes_stub.c
-        cipher_stub.c
-        cmac_stub.c
         ip4tos_stub.c
         stoip4_stub.c
-        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
 )
 
 target_link_libraries(mbed-stubs-connectivity
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index e011ad27dd..68a16b1156 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -41,4 +41,5 @@ else()
     add_subdirectory(cellular)
     add_subdirectory(lorawan)
     add_subdirectory(netsocket)
+    add_subdirectory(mbedtls)
 endif()
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
index edca76f292..aa70031102 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-lorawan
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         gmock_main
 )
 
diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt
index 51938fe78d..f000967e33 100644
--- a/connectivity/mbedtls/CMakeLists.txt
+++ b/connectivity/mbedtls/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 target_include_directories(mbed-mbedtls
     INTERFACE
         .
diff --git a/connectivity/mbedtls/tests/UNITTESTS/.mbedignore b/connectivity/mbedtls/tests/UNITTESTS/.mbedignore
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/connectivity/mbedtls/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/connectivity/mbedtls/tests/UNITTESTS/CMakeLists.txt b/connectivity/mbedtls/tests/UNITTESTS/CMakeLists.txt
new file mode 100644
index 0000000000..fa602edaab
--- /dev/null
+++ b/connectivity/mbedtls/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+add_subdirectory(doubles)
diff --git a/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
new file mode 100644
index 0000000000..fad943c388
--- /dev/null
+++ b/connectivity/mbedtls/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-stubs-mbedtls)
+
+target_sources(mbed-stubs-mbedtls
+    PRIVATE
+        aes_stub.c
+        cipher_stub.c
+        cmac_stub.c
+        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
+)
+
+target_link_libraries(mbed-stubs-mbedtls
+    PRIVATE
+        mbed-headers
+        mbed-stubs-headers
+        mbed-stubs-rtos
+        gtest
+)
diff --git a/UNITTESTS/stubs/connectivity/aes_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c
similarity index 100%
rename from UNITTESTS/stubs/connectivity/aes_stub.c
rename to connectivity/mbedtls/tests/UNITTESTS/doubles/aes_stub.c
diff --git a/UNITTESTS/stubs/connectivity/cipher_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c
similarity index 100%
rename from UNITTESTS/stubs/connectivity/cipher_stub.c
rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cipher_stub.c
diff --git a/UNITTESTS/stubs/connectivity/cmac_stub.c b/connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c
similarity index 100%
rename from UNITTESTS/stubs/connectivity/cmac_stub.c
rename to connectivity/mbedtls/tests/UNITTESTS/doubles/cmac_stub.c
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
index 9564055efa..9573c2cf8b 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
index bfc358b809..a7fc88db5c 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
index 8d1fc33329..71f0dd5756 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
@@ -32,6 +32,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
index 56248a39b7..15e6afbd88 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-mbedtls
         mbed-stubs-netsocket
         gmock_main
 )