diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index ce1e5ec52c..8fe0d35092 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -30,8 +30,6 @@ target_include_directories(mbed-headers-base
 
 target_include_directories(mbed-headers-connectivity
     INTERFACE
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
         ${mbed-os_SOURCE_DIR}/connectivity
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
@@ -48,13 +46,10 @@ target_include_directories(mbed-stubs-headers
         .
 )
 
-add_subdirectory(connectivity)
-
 add_library(mbed-stubs INTERFACE)
 
 target_link_libraries(mbed-stubs
     INTERFACE
-        mbed-stubs-connectivity
         mbed-stubs-drivers
         mbed-stubs-events
         mbed-stubs-hal
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
deleted file mode 100644
index df8dbd5bf3..0000000000
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2021 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stubs-connectivity)
-
-target_compile_definitions(mbed-stubs-connectivity
-    PRIVATE
-        DEVICE_SERIAL=1
-        DEVICE_INTERRUPTIN=1
-        MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
-        MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION=true
-        MBED_CONF_LORA_AUTOMATIC_UPLINK_MESSAGE=true
-        MBED_CONF_LORA_TX_MAX_SIZE=255
-        MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
-        MDMTXD=NC
-        MDMRXD=NC
-)
-
-target_sources(mbed-stubs-connectivity
-    PRIVATE
-        ip4tos_stub.c
-        stoip4_stub.c
-)
-
-target_link_libraries(mbed-stubs-connectivity
-    PRIVATE
-        mbed-headers
-        mbed-stubs-headers
-        mbed-stubs-rtos
-        mbed-stubs-platform
-        gtest
-)
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 68a16b1156..9d75d3b321 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -42,4 +42,5 @@ else()
     add_subdirectory(lorawan)
     add_subdirectory(netsocket)
     add_subdirectory(mbedtls)
+    add_subdirectory(libraries)
 endif()
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
index 1f84162a9d..b7c7244f5e 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
index 9d8c2aa34a..56e3e80aa0 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -36,6 +36,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
diff --git a/connectivity/libraries/CMakeLists.txt b/connectivity/libraries/CMakeLists.txt
index 18ce713470..7d856fa25c 100644
--- a/connectivity/libraries/CMakeLists.txt
+++ b/connectivity/libraries/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(mbed-coap)
 add_subdirectory(nanostack-libservice)
 add_subdirectory(ppp)
diff --git a/connectivity/libraries/tests/UNITTESTS/.mbedignore b/connectivity/libraries/tests/UNITTESTS/.mbedignore
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/connectivity/libraries/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt b/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt
new file mode 100644
index 0000000000..b632a73f47
--- /dev/null
+++ b/connectivity/libraries/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(doubles)
diff --git a/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt
new file mode 100644
index 0000000000..f36fa6abb2
--- /dev/null
+++ b/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-nanostack-libservice INTERFACE)
+
+target_include_directories(mbed-headers-nanostack-libservice
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
+        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
+)
+add_library(mbed-stubs-nanostack-libservice)
+
+target_sources(mbed-stubs-nanostack-libservice
+    PRIVATE
+        ip4tos_stub.c
+        stoip4_stub.c
+)
+
+target_link_libraries(mbed-stubs-nanostack-libservice
+    PRIVATE
+        mbed-headers-nanostack-libservice
+        gtest
+)
diff --git a/UNITTESTS/stubs/connectivity/ip4tos_stub.c b/connectivity/libraries/tests/UNITTESTS/doubles/ip4tos_stub.c
similarity index 100%
rename from UNITTESTS/stubs/connectivity/ip4tos_stub.c
rename to connectivity/libraries/tests/UNITTESTS/doubles/ip4tos_stub.c
diff --git a/UNITTESTS/stubs/connectivity/stoip4_stub.c b/connectivity/libraries/tests/UNITTESTS/doubles/stoip4_stub.c
similarity index 100%
rename from UNITTESTS/stubs/connectivity/stoip4_stub.c
rename to connectivity/libraries/tests/UNITTESTS/doubles/stoip4_stub.c
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
index 7a8a4c1f79..311aa7918f 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
@@ -31,6 +31,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
index 27de0ddbfd..ce9bc9dc5e 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
@@ -30,6 +30,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
index c0c34e3ff4..356e869d88 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-headers
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
index 5056cc0fba..d658c702dc 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
@@ -43,6 +43,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
index efed786cc8..53daa2164c 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
@@ -26,6 +26,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
index 80862ec158..7f03ae2106 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
@@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
index 77a21b3cd2..b6ac2bffef 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
@@ -25,6 +25,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
index d2b8b7dcfe..2fc2180052 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
@@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
index 0e36bc724d..3cad0d68f4 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
index b4d6d164e9..8e54e74164 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
@@ -27,6 +27,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
index e10cd24943..996a83f216 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
@@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
index 43472c5f20..963806da5d 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-mbedtls
         mbed-headers-netsocket
         mbed-stubs
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
index e4ffc7e663..f79024d257 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers