diff --git a/CMakeLists.txt b/CMakeLists.txt
index f85615f..ca5185f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
     include(CTest)
+    add_definitions(-DUNITTEST)
     add_subdirectory(UNITTESTS)
 endif()
 
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 35e26db..8fb608a 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -5,8 +5,6 @@
 set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
 set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "")
 
-add_definitions(-DUNITTEST)
-
 if (MINGW)
     # enable PRIx formatting globally
     add_definitions(-D__STDC_FORMAT_MACROS)
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
index 2e70a42..895212b 100644
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -28,7 +28,6 @@
 
 target_link_libraries(mbed-stubs-connectivity
     PRIVATE
-        mbed-stubs-rtos-headers
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-rtos
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
index b2ce284..ac50d03 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -31,7 +31,6 @@
         mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
-        mbed-stubs-rtos-headers
         gmock_main
 )
 
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 2361dff..1f84162 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -33,7 +33,6 @@
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
-        mbed-stubs-rtos-headers
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
index ab3529d..24cdefd 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -34,7 +34,6 @@
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
-        mbed-stubs-rtos-headers
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
index 634caa0..c9b0768 100644
--- a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -30,7 +30,6 @@
 target_link_libraries(mbed-stubs-netsocket
     PRIVATE
         mbed-headers-netsocket
-        mbed-stubs-rtos-headers
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-rtos
diff --git a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
index e827f16..babf17c 100644
--- a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -9,15 +9,13 @@
         ${mbed-os_SOURCE_DIR}/rtos/include/rtos
 )
 
-add_library(mbed-stubs-rtos-headers INTERFACE)
+add_library(mbed-stubs-rtos)
 
-target_include_directories(mbed-stubs-rtos-headers
+target_include_directories(mbed-stubs-rtos
     INTERFACE
         .
 )
 
-add_library(mbed-stubs-rtos)
-
 target_compile_definitions(mbed-stubs-rtos
     PRIVATE
         MBED_CONF_RTOS_PRESENT=1