diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 8fb608a6ed8..c194021a979 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -56,5 +56,3 @@ if (VALGRIND)
 endif(VALGRIND)
 
 add_subdirectory(stubs)
-add_subdirectory(fakes)
-
diff --git a/UNITTESTS/fakes/CMakeLists.txt b/UNITTESTS/fakes/CMakeLists.txt
deleted file mode 100644
index 8c1c4a9f3f5..00000000000
--- a/UNITTESTS/fakes/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(ble)
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 8fe0d350923..9a10220f31a 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -4,13 +4,11 @@
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
 add_library(mbed-headers-base INTERFACE)
-add_library(mbed-headers-connectivity INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
         mbed-headers-base
         mbed-headers-platform
-        mbed-headers-connectivity
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
@@ -28,12 +26,6 @@ target_include_directories(mbed-headers-base
         ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
 )
 
-target_include_directories(mbed-headers-connectivity
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/connectivity
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
-)
 
 target_include_directories(mbed-headers
     INTERFACE
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 9d75d3b3216..dcf9b48c36d 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -43,4 +43,5 @@ else()
     add_subdirectory(netsocket)
     add_subdirectory(mbedtls)
     add_subdirectory(libraries)
+    add_subdirectory(FEATURE_BLE)
 endif()
diff --git a/connectivity/FEATURE_BLE/CMakeLists.txt b/connectivity/FEATURE_BLE/CMakeLists.txt
index c2e0c02d2df..1e9da9185a7 100644
--- a/connectivity/FEATURE_BLE/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/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()
+
 add_subdirectory(libraries)
 add_subdirectory(source)
 
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/.mbedignore b/connectivity/FEATURE_BLE/tests/UNITTESTS/.mbedignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/CMakeLists.txt
new file mode 100644
index 00000000000..fa602edaab1
--- /dev/null
+++ b/connectivity/FEATURE_BLE/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/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt
new file mode 100644
index 00000000000..93a943c9aea
--- /dev/null
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(fakes)
+
+add_library(mbed-headers-feature-ble INTERFACE)
+
+target_include_directories(mbed-headers-feature-ble
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
+)
diff --git a/UNITTESTS/fakes/ble/BLE.cpp b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
similarity index 99%
rename from UNITTESTS/fakes/ble/BLE.cpp
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
index 57eb53d52b1..9dbedb14dfb 100644
--- a/UNITTESTS/fakes/ble/BLE.cpp
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/CMakeLists.txt
similarity index 57%
rename from UNITTESTS/fakes/ble/CMakeLists.txt
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/CMakeLists.txt
index c8fb84935de..75ae98d64af 100644
--- a/UNITTESTS/fakes/ble/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(mbed-fakes-ble)
 
 target_include_directories(mbed-fakes-ble
     PUBLIC
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source
@@ -24,18 +24,19 @@ target_sources(mbed-fakes-ble
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/GattClient.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/GattServer.cpp
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/source/SecurityManager.cpp
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/BLE.cpp
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/ble_mocks.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/GapImpl_mock.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/GattClientImpl_mock.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/GattServerImpl_mock.h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/BLE.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
 )
 
 target_link_libraries(mbed-fakes-ble
     PRIVATE
-        mbed-headers
-        mbed-stubs-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
         gcov
 )
diff --git a/UNITTESTS/fakes/ble/GapImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
similarity index 99%
rename from UNITTESTS/fakes/ble/GapImpl_mock.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
index b59461da140..6ef5aba2267 100644
--- a/UNITTESTS/fakes/ble/GapImpl_mock.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GapImpl_mock.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/GattClientImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
similarity index 99%
rename from UNITTESTS/fakes/ble/GattClientImpl_mock.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
index 6150ad1697e..d0221a5dbb9 100644
--- a/UNITTESTS/fakes/ble/GattClientImpl_mock.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattClientImpl_mock.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/GattServerImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
similarity index 99%
rename from UNITTESTS/fakes/ble/GattServerImpl_mock.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
index bfafb524005..527a71fb21c 100644
--- a/UNITTESTS/fakes/ble/GattServerImpl_mock.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/GattServerImpl_mock.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
similarity index 99%
rename from UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
index 014b077596c..d0fd45214a0 100644
--- a/UNITTESTS/fakes/ble/SecurityManagerImpl_mock.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/SecurityManagerImpl_mock.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/ble_mocks.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
similarity index 99%
rename from UNITTESTS/fakes/ble/ble_mocks.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
index d92904e1738..2f927a7a092 100644
--- a/UNITTESTS/fakes/ble/ble_mocks.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/ble_mocks.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/source/GattServerImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl.h
similarity index 99%
rename from UNITTESTS/fakes/ble/source/GattServerImpl.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl.h
index d4b43490d37..6583a33e296 100644
--- a/UNITTESTS/fakes/ble/source/GattServerImpl.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
similarity index 99%
rename from UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
index baf6d0c8a6f..de6fdf168a3 100644
--- a/UNITTESTS/fakes/ble/source/GattServerImpl_mock.cpp
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/GattServerImpl_mock.cpp
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2021 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GapImpl.h
similarity index 99%
rename from UNITTESTS/fakes/ble/source/generic/GapImpl.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GapImpl.h
index 6cd3bbf41f9..64704ef30d1 100644
--- a/UNITTESTS/fakes/ble/source/generic/GapImpl.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GapImpl.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/source/generic/GattClientImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GattClientImpl.h
similarity index 99%
rename from UNITTESTS/fakes/ble/source/generic/GattClientImpl.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GattClientImpl.h
index 2795ffeec9e..a0bc5e8b1cd 100644
--- a/UNITTESTS/fakes/ble/source/generic/GattClientImpl.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/GattClientImpl.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/UNITTESTS/fakes/ble/source/generic/SecurityManagerImpl.h b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/SecurityManagerImpl.h
similarity index 99%
rename from UNITTESTS/fakes/ble/source/generic/SecurityManagerImpl.h
rename to connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/SecurityManagerImpl.h
index 7f033f4a1bf..8bc12344406 100644
--- a/UNITTESTS/fakes/ble/source/generic/SecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/fakes/source/generic/SecurityManagerImpl.h
@@ -1,7 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2020 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -27,7 +27,7 @@ class SecurityManager {
     SecurityManager(const SecurityManager&) = delete;
     SecurityManager& operator=(const SecurityManager&) = delete;
     virtual ~SecurityManager() {};
-    
+
     using SecurityIOCapabilities_t = ble::SecurityManager::SecurityIOCapabilities_t;
     using SecurityMode_t = ble::SecurityManager::SecurityMode_t;
     using SecurityManagerShutdownCallback_t = ble::SecurityManager::SecurityManagerShutdownCallback_t;
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
index 8e310cceeef..4089759e2b4 100644
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -50,7 +50,6 @@ target_sources(mbed-stubs-cellular
 target_link_libraries(mbed-stubs-cellular
     PRIVATE
         mbed-headers-base
-        mbed-headers-connectivity
         mbed-stubs-platform
         mbed-headers-rtos
         mbed-headers-drivers
diff --git a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
index ab15847a01a..66f929dfb9e 100644
--- a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(mbed-headers-lorawan INTERFACE)
 
 target_include_directories(mbed-headers-lorawan
     INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity
         ${mbed-os_SOURCE_DIR}/connectivity/lorawan/include/lorawan
         ${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack
         ${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack/mac
@@ -43,7 +44,6 @@ target_link_libraries(mbed-stubs-lorawan
         mbed-headers-events
         mbed-headers-hal
         mbed-stubs-headers
-        mbed-headers-connectivity
         mbed-headers-platform
         mbed-headers-lorawan
         mbed-headers-mbedtls
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
index e530523e396..3b9df8071c6 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
@@ -37,7 +37,6 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-events
         mbed-headers-hal
         mbed-headers-platform
-        mbed-headers-connectivity
         mbed-headers-mbedtls
         mbed-headers-lorawan
         mbed-stubs
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
index 6f6df985916..13981d3f542 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
@@ -21,7 +21,6 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
-        mbed-headers-connectivity
         mbed-headers-platform
         mbed-headers-mbedtls
         mbed-headers-lorawan
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
index 9ba6465229c..643a0261787 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
@@ -19,7 +19,6 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers-base
-        mbed-headers-connectivity
         mbed-headers-platform
         mbed-headers-mbedtls
         mbed-headers-lorawan
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
index bbf6e7fb498..d386502a501 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
@@ -22,7 +22,6 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
-        mbed-headers-connectivity
         mbed-headers-platform
         mbed-headers-cellular
         mbed-headers-mbedtls
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
index 759a9ddb1ed..594c79fb224 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
-        mbed-headers-connectivity
         mbed-headers-platform
         mbed-headers-mbedtls
         mbed-headers-lorawan