diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 68ab21a0ff..4f76140bac 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -4,7 +4,6 @@
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
 add_library(mbed-headers-base INTERFACE)
-add_library(mbed-headers-platform INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
 add_library(mbed-headers-events INTERFACE)
 
@@ -19,15 +18,6 @@ target_link_libraries(mbed-headers
         mbed-headers-rtos
 )
 
-target_include_directories(mbed-headers-platform
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/platform/include
-        ${mbed-os_SOURCE_DIR}/platform/include/platform
-        ${mbed-os_SOURCE_DIR}/platform/randlib/include/mbed-client-randlib/
-        ${mbed-os_SOURCE_DIR}/platform/randlib/include/
-        ${mbed-os_SOURCE_DIR}/platform/mbed-trace/include
-)
-
 target_include_directories(mbed-headers-base
     INTERFACE
         ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h
@@ -74,7 +64,6 @@ target_include_directories(mbed-stubs-headers
 
 add_subdirectory(connectivity)
 add_subdirectory(events)
-add_subdirectory(platform)
 
 add_library(mbed-stubs INTERFACE)
 
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
index eaf86ac813..72e79c551d 100644
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -40,5 +40,6 @@ target_link_libraries(mbed-stubs-connectivity
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-rtos
+        mbed-stubs-platform
         gtest
 )
diff --git a/UNITTESTS/stubs/platform/CMakeLists.txt b/UNITTESTS/stubs/platform/CMakeLists.txt
deleted file mode 100644
index 051bc67877..0000000000
--- a/UNITTESTS/stubs/platform/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2021 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stubs-platform)
-
-target_sources(mbed-stubs-platform
-    PRIVATE
-        mbed_critical_stub.c
-        mbed_atomic_stub.c
-        mbed_error.c
-        mbed_poll_stub.cpp
-        mbed_assert_stub.cpp
-        mbed_wait_api_stub.cpp
-        mbed_retarget_stub.cpp
-        FileHandle_stub.cpp
-        nvic_wrapper_stub.c
-        randLIB_stub.c
-        randLIB_stub.cpp
-)
-
-target_link_options(mbed-stubs-platform
-    PRIVATE
-        --coverage
-)
-
-target_link_libraries(mbed-stubs-platform
-    PRIVATE
-        mbed-headers
-        mbed-stubs-headers
-)
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
index 35d9d865e2..7934053f08 100644
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -51,7 +51,7 @@ target_link_libraries(mbed-stubs-cellular
     PRIVATE
         mbed-headers-base
         mbed-headers-connectivity
-        mbed-headers-platform
+        mbed-stubs-platform
         mbed-headers-rtos
         mbed-headers-drivers
         mbed-headers-hal
diff --git a/platform/tests/UNITTESTS/ATCmdParser/CMakeLists.txt b/platform/tests/UNITTESTS/ATCmdParser/CMakeLists.txt
index eeda6edee1..0876c100bd 100644
--- a/platform/tests/UNITTESTS/ATCmdParser/CMakeLists.txt
+++ b/platform/tests/UNITTESTS/ATCmdParser/CMakeLists.txt
@@ -13,8 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
-        mbed-stubs-headers
         mbed-stubs-platform
         gmock_main
 )
diff --git a/platform/tests/UNITTESTS/CMakeLists.txt b/platform/tests/UNITTESTS/CMakeLists.txt
index 65eb23055d..88b941022a 100644
--- a/platform/tests/UNITTESTS/CMakeLists.txt
+++ b/platform/tests/UNITTESTS/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(doubles)
 add_subdirectory(ATCmdParser)
 add_subdirectory(CircularBuffer)
diff --git a/platform/tests/UNITTESTS/CircularBuffer/CMakeLists.txt b/platform/tests/UNITTESTS/CircularBuffer/CMakeLists.txt
index 45fd750888..caf75637e5 100644
--- a/platform/tests/UNITTESTS/CircularBuffer/CMakeLists.txt
+++ b/platform/tests/UNITTESTS/CircularBuffer/CMakeLists.txt
@@ -6,14 +6,13 @@ set(TEST_NAME circularbuffer-unittest)
 add_executable(${TEST_NAME})
 
 target_sources(${TEST_NAME}
-    PRIVATE        
+    PRIVATE
         test_CircularBuffer.cpp
 )
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers        
-        mbed-stubs-platform      
+        mbed-stubs-platform
         gmock_main
 )
 
diff --git a/platform/tests/UNITTESTS/doubles/CMakeLists.txt b/platform/tests/UNITTESTS/doubles/CMakeLists.txt
new file mode 100644
index 0000000000..ac94aabeba
--- /dev/null
+++ b/platform/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-platform INTERFACE)
+target_include_directories(mbed-headers-platform
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/platform/include
+        ${mbed-os_SOURCE_DIR}/platform/include/platform
+        ${mbed-os_SOURCE_DIR}/platform/randlib/include/mbed-client-randlib/
+        ${mbed-os_SOURCE_DIR}/platform/randlib/include/
+        ${mbed-os_SOURCE_DIR}/platform/mbed-trace/include
+)
+
+add_library(mbed-stubs-platform)
+target_sources(mbed-stubs-platform
+    PRIVATE
+        mbed_critical_stub.c
+        mbed_atomic_stub.c
+        mbed_error.c
+        mbed_poll_stub.cpp
+        mbed_assert_stub.cpp
+        mbed_wait_api_stub.cpp
+        mbed_retarget_stub.cpp
+        FileHandle_stub.cpp
+        nvic_wrapper_stub.c
+        randLIB_stub.c
+        randLIB_stub.cpp
+)
+target_include_directories(mbed-stubs-platform
+    PUBLIC
+        .
+)
+target_link_libraries(mbed-stubs-platform
+    PUBLIC
+        mbed-headers-base
+        mbed-headers-hal
+        mbed-headers-platform
+)
diff --git a/UNITTESTS/stubs/platform/FileHandle_stub.cpp b/platform/tests/UNITTESTS/doubles/FileHandle_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/platform/FileHandle_stub.cpp
rename to platform/tests/UNITTESTS/doubles/FileHandle_stub.cpp
diff --git a/UNITTESTS/stubs/FileHandle_stub.h b/platform/tests/UNITTESTS/doubles/FileHandle_stub.h
similarity index 100%
rename from UNITTESTS/stubs/FileHandle_stub.h
rename to platform/tests/UNITTESTS/doubles/FileHandle_stub.h
diff --git a/UNITTESTS/stubs/platform/mbed_assert_stub.cpp b/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_assert_stub.cpp
rename to platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp
diff --git a/UNITTESTS/stubs/platform/mbed_atomic_stub.c b/platform/tests/UNITTESTS/doubles/mbed_atomic_stub.c
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_atomic_stub.c
rename to platform/tests/UNITTESTS/doubles/mbed_atomic_stub.c
diff --git a/UNITTESTS/stubs/platform/mbed_critical_stub.c b/platform/tests/UNITTESTS/doubles/mbed_critical_stub.c
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_critical_stub.c
rename to platform/tests/UNITTESTS/doubles/mbed_critical_stub.c
diff --git a/UNITTESTS/stubs/platform/mbed_error.c b/platform/tests/UNITTESTS/doubles/mbed_error.c
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_error.c
rename to platform/tests/UNITTESTS/doubles/mbed_error.c
diff --git a/UNITTESTS/stubs/platform/mbed_poll_stub.cpp b/platform/tests/UNITTESTS/doubles/mbed_poll_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_poll_stub.cpp
rename to platform/tests/UNITTESTS/doubles/mbed_poll_stub.cpp
diff --git a/UNITTESTS/stubs/mbed_poll_stub.h b/platform/tests/UNITTESTS/doubles/mbed_poll_stub.h
similarity index 100%
rename from UNITTESTS/stubs/mbed_poll_stub.h
rename to platform/tests/UNITTESTS/doubles/mbed_poll_stub.h
diff --git a/UNITTESTS/stubs/platform/mbed_retarget_stub.cpp b/platform/tests/UNITTESTS/doubles/mbed_retarget_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_retarget_stub.cpp
rename to platform/tests/UNITTESTS/doubles/mbed_retarget_stub.cpp
diff --git a/UNITTESTS/stubs/platform/mbed_wait_api_stub.cpp b/platform/tests/UNITTESTS/doubles/mbed_wait_api_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/platform/mbed_wait_api_stub.cpp
rename to platform/tests/UNITTESTS/doubles/mbed_wait_api_stub.cpp
diff --git a/UNITTESTS/stubs/platform/nvic_wrapper_stub.c b/platform/tests/UNITTESTS/doubles/nvic_wrapper_stub.c
similarity index 100%
rename from UNITTESTS/stubs/platform/nvic_wrapper_stub.c
rename to platform/tests/UNITTESTS/doubles/nvic_wrapper_stub.c
diff --git a/UNITTESTS/stubs/platform/randLIB_stub.c b/platform/tests/UNITTESTS/doubles/randLIB_stub.c
similarity index 100%
rename from UNITTESTS/stubs/platform/randLIB_stub.c
rename to platform/tests/UNITTESTS/doubles/randLIB_stub.c
diff --git a/UNITTESTS/stubs/platform/randLIB_stub.cpp b/platform/tests/UNITTESTS/doubles/randLIB_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/platform/randLIB_stub.cpp
rename to platform/tests/UNITTESTS/doubles/randLIB_stub.cpp