diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake
index 8b9b99a6e8..96ce3752e2 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake
@@ -12,7 +12,6 @@ set(unittest-includes ${unittest-includes}
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../drivers
   ../hal
-  ../features/cellular
 )
 
 # Source files
@@ -60,4 +59,3 @@ set(unittest-test-flags
   -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
   -DMBED_CONF_CELLULAR_USE_SMS=1
 )
-
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake
index b591f96927..91917ec709 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake
@@ -9,7 +9,6 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/cellular
 )
 
 # Source files
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake
index a4f8263d81..7d714b550c 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake
@@ -9,7 +9,6 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/cellular
 )
 
 # Source files
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake
index 3fa367463b..071c447b4b 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake
@@ -9,7 +9,6 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/cellular
 )
 
 # Source files
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake
index 154032ea9c..7fdfcee988 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake
@@ -9,7 +9,6 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/cellular
 )
 
 # Source files
@@ -51,4 +50,3 @@ set(unittest-test-flags
   -DDEVICE_INTERRUPTIN=1
   -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
-
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake
index 18d86f3958..b0052a7ec8 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/unittest.cmake
@@ -48,4 +48,3 @@ set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
 )
-
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/unittest.cmake b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/unittest.cmake
index 2d4eb7155d..29503eb2ad 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/unittest.cmake
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/unittest.cmake
@@ -5,7 +5,6 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  ../features/cellular
 )
 
 set(unittest-sources