diff --git a/connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt
new file mode 100644
index 00000000000..7b7d2b7c612
--- /dev/null
+++ b/connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "")
+set(TEST_TARGET mbed-connectivity-netsocket-dns)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+list(
+    APPEND 
+        TEST_SOURCE_LIST
+            synchronous_dns_multiple.cpp
+            synchronous_dns_multi_ip.cpp
+            synchronous_dns_invalid.cpp
+            synchronous_dns.cpp
+            synchronous_dns_cache.cpp
+            asynchronous_dns_timeouts.cpp
+            asynchronous_dns_simultaneous_repeat.cpp
+            asynchronous_dns_simultaneous.cpp
+            asynchronous_dns_simultaneous_cache.cpp
+            asynchronous_dns_non_async_and_async.cpp
+            asynchronous_dns_multi_ip.cpp
+            asynchronous_dns_invalid_host.cpp
+            asynchronous_dns_external_event_queue.cpp
+            asynchronous_dns.cpp
+            asynchronous_dns_cancel.cpp
+            asynchronous_dns_cache.cpp
+)
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_SOURCES ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS mbed-netsocket
+)
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/nidd/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/nidd/CMakeLists.txt
new file mode 100644
index 00000000000..5f9dd53bbc5
--- /dev/null
+++ b/connectivity/netsocket/tests/TESTS/netsocket/nidd/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "")
+set(TEST_TARGET mbed-connectivity-netsocket-nidd)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+list(
+    APPEND
+        TEST_SOURCE_LIST
+            niddsocket_send_timeout.cpp
+            niddsocket_send_repeat.cpp
+            niddsocket_send_invalid.cpp
+            niddsocket_recv_timeout.cpp
+            niddsocket_open_twice.cpp
+            niddsocket_open_limit.cpp
+            niddsocket_open_destruct.cpp
+            niddsocket_open_close_repeat.cpp
+            niddsocket_echotest.cpp
+            niddsocket_disconnect.cpp
+            niddsocket_connect.cpp       
+)
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_SOURCES ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS mbed-netsocket
+)
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt
new file mode 100644
index 00000000000..7302fef550a
--- /dev/null
+++ b/connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "")
+set(TEST_TARGET mbed-connectivity-netsocket-tcp)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+list(
+    APPEND
+        TEST_SOURCE_LIST
+            tcpsocket_thread_per_socket_safety.cpp
+            tcpsocket_setsockopt_keepalive_valid.cpp
+            tcpsocket_send_timeout.cpp
+            tcpsocket_send_repeat.cpp
+            tcpsocket_recv_timeout.cpp
+            tcpsocket_open_twice.cpp
+            tcpsocket_open_limit.cpp
+            tcpsocket_open_destruct.cpp
+            tcpsocket_open_close_repeat.cpp
+            tcpsocket_endpoint_close.cpp
+            tcpsocket_echotest.cpp
+            tcpsocket_echotest_burst.cpp
+            tcpsocket_connect_invalid.cpp
+            tcpsocket_bind_wrong_type.cpp
+            tcpsocket_bind_unopened.cpp
+            tcpsocket_bind_port_fail.cpp
+            tcpsocket_bind_port.cpp
+            tcpsocket_bind_address_invalid.cpp
+            tcpsocket_bind_address.cpp       
+            tcpsocket_recv_100k.cpp       	
+)
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_SOURCES ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS mbed-netsocket
+)
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt
new file mode 100644
index 00000000000..c48b321681f
--- /dev/null
+++ b/connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "")
+set(TEST_TARGET mbed-connectivity-netsocket-tls)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+list(
+    APPEND
+        TEST_SOURCE_LIST
+            tlssocket_simultaneous.cpp
+            tlssocket_send_unconnected.cpp
+            tlssocket_send_timeout.cpp
+            tlssocket_send_repeat.cpp
+            tlssocket_send_closed.cpp
+            tlssocket_recv_timeout.cpp
+            tlssocket_open_twice.cpp
+            tlssocket_open_limit.cpp
+            tlssocket_open_destruct.cpp
+            tlssocket_no_cert.cpp
+            tlssocket_handshake_invalid.cpp
+            tlssocket_endpoint_close.cpp
+            tlssocket_echotest.cpp
+            tlssocket_echotest_burst.cpp
+            tlssocket_connect_invalid.cpp       
+)
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_SOURCES ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS mbed-netsocket
+)
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt
new file mode 100644
index 00000000000..8e4089594db
--- /dev/null
+++ b/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "")
+set(TEST_TARGET mbed-connectivity-netsocket-udp)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+list(
+    APPEND
+        TEST_SOURCE_LIST
+            udpsocket_bind_port.cpp
+            udpsocket_bind_address_null.cpp
+            udpsocket_bind_address_invalid.cpp
+            udpsocket_bind_address.cpp            
+            udpsocket_sendto_timeout.cpp
+            udpsocket_sendto_repeat.cpp
+            udpsocket_sendto_invalid.cpp
+            udpsocket_recv_timeout.cpp
+            udpsocket_open_twice.cpp
+            udpsocket_open_limit.cpp
+            udpsocket_open_destruct.cpp
+            udpsocket_open_close_repeat.cpp
+            udpsocket_echotest.cpp
+            udpsocket_bind_wrong_type.cpp
+            udpsocket_bind_unopened.cpp
+            udpsocket_bind_port_fail.cpp
+            udpsocket_echotest_burst.cpp       
+)
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_SOURCES ${TEST_SOURCE_LIST}
+    TEST_REQUIRED_LIBS mbed-netsocket
+)