diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 39a3e181b2..8ca02ab694 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -112,7 +112,8 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/stubs"
   "${PROJECT_SOURCE_DIR}/.."
   "${PROJECT_SOURCE_DIR}/../features"
-  "${PROJECT_SOURCE_DIR}/../platform"
+  "${PROJECT_SOURCE_DIR}/../platform/include"
+  "${PROJECT_SOURCE_DIR}/../platform/include/platform"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
   "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
diff --git a/platform/tests/.mbedignore b/platform/tests/.mbedignore
new file mode 100644
index 0000000000..979080d2da
--- /dev/null
+++ b/platform/tests/.mbedignore
@@ -0,0 +1 @@
+UNITTESTS/*
\ No newline at end of file
diff --git a/UNITTESTS/platform/ATCmdParser/test_ATCmdParser.cpp b/platform/tests/UNITTESTS/ATCmdParser/test_ATCmdParser.cpp
similarity index 100%
rename from UNITTESTS/platform/ATCmdParser/test_ATCmdParser.cpp
rename to platform/tests/UNITTESTS/ATCmdParser/test_ATCmdParser.cpp
diff --git a/UNITTESTS/platform/ATCmdParser/unittest.cmake b/platform/tests/UNITTESTS/ATCmdParser/unittest.cmake
similarity index 80%
rename from UNITTESTS/platform/ATCmdParser/unittest.cmake
rename to platform/tests/UNITTESTS/ATCmdParser/unittest.cmake
index de19302015..77c8433dfd 100644
--- a/UNITTESTS/platform/ATCmdParser/unittest.cmake
+++ b/platform/tests/UNITTESTS/ATCmdParser/unittest.cmake
@@ -9,7 +9,7 @@ set(unittest-sources
 
 # Test files
 set(unittest-test-sources
-  platform/ATCmdParser/test_ATCmdParser.cpp
+  ../platform/tests/UNITTESTS/ATCmdParser/test_ATCmdParser.cpp
   stubs/FileHandle_stub.cpp
   stubs/mbed_assert_stub.cpp
   stubs/mbed_poll_stub.cpp
diff --git a/UNITTESTS/platform/CircularBuffer/test_CircularBuffer.cpp b/platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
similarity index 100%
rename from UNITTESTS/platform/CircularBuffer/test_CircularBuffer.cpp
rename to platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
diff --git a/UNITTESTS/platform/CircularBuffer/unittest.cmake b/platform/tests/UNITTESTS/CircularBuffer/unittest.cmake
similarity index 61%
rename from UNITTESTS/platform/CircularBuffer/unittest.cmake
rename to platform/tests/UNITTESTS/CircularBuffer/unittest.cmake
index 34187f4f95..fce3ae8fdd 100644
--- a/UNITTESTS/platform/CircularBuffer/unittest.cmake
+++ b/platform/tests/UNITTESTS/CircularBuffer/unittest.cmake
@@ -7,5 +7,5 @@ set(unittest-sources
 )
 
 set(unittest-test-sources
-  platform/CircularBuffer/test_CircularBuffer.cpp
+  ../platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
 )