diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index d149c3c8b9..612155a15e 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -114,6 +114,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features"
   "${PROJECT_SOURCE_DIR}/../platform/include"
   "${PROJECT_SOURCE_DIR}/../platform/include/platform"
+  "${PROJECT_SOURCE_DIR}/../platform/mbed-trace/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
   "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
@@ -132,7 +133,6 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../events/source"
   "${PROJECT_SOURCE_DIR}/../rtos/include"
   "${PROJECT_SOURCE_DIR}/../features/frameworks"
-  "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
   "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
   "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
   "${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include"
diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
index 88fc349112..e4b84994aa 100644
--- a/UNITTESTS/empty_baseline/unittest.cmake
+++ b/UNITTESTS/empty_baseline/unittest.cmake
@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
   ..
   ../connectivity/mbedtls/include/mbedtls/
   ../connectivity/mbedtls/platform/inc/
-  ../features/frameworks/mbed-trace/mbed-trace/
+  ../platform/mbed-trace/mbed-trace/
 )
 
 set(unittest-test-sources
diff --git a/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md b/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md
index 4ce80705f0..395acc3d7c 100644
--- a/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md
+++ b/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md
@@ -13,7 +13,7 @@ The STMOD+ Connector specification can be found [here](https://www.st.com/conten
 
 ## Debug print
 
-mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/features/frameworks/mbed-trace/README.md
+mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/platform/mbed-trace/README.md
 
 Enable it in your mbed_app.json file:
 
diff --git a/drivers/source/SFDP.cpp b/drivers/source/SFDP.cpp
index 193c707ff4..745f4b0be7 100644
--- a/drivers/source/SFDP.cpp
+++ b/drivers/source/SFDP.cpp
@@ -26,7 +26,7 @@
 
 #if (DEVICE_SPI || DEVICE_QSPI)
 
-#include "features/frameworks/mbed-trace/mbed-trace/mbed_trace.h"
+#include "platform/mbed-trace/mbed-trace/mbed_trace.h"
 #define TRACE_GROUP "SFDP"
 
 namespace {
diff --git a/features/frameworks/mbed-trace/.gitignore b/platform/mbed-trace/.gitignore
similarity index 100%
rename from features/frameworks/mbed-trace/.gitignore
rename to platform/mbed-trace/.gitignore
diff --git a/features/frameworks/mbed-trace/.mbedignore b/platform/mbed-trace/.mbedignore
similarity index 100%
rename from features/frameworks/mbed-trace/.mbedignore
rename to platform/mbed-trace/.mbedignore
diff --git a/features/frameworks/mbed-trace/CMakeLists.txt b/platform/mbed-trace/CMakeLists.txt
similarity index 99%
rename from features/frameworks/mbed-trace/CMakeLists.txt
rename to platform/mbed-trace/CMakeLists.txt
index 86396b4a4c..1b0db50b06 100644
--- a/features/frameworks/mbed-trace/CMakeLists.txt
+++ b/platform/mbed-trace/CMakeLists.txt
@@ -15,4 +15,3 @@ set (MBED_TRACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/source/mbed_trace.c)
 
 
 CREATE_LIBRARY(mbedTrace "${MBED_TRACE_SRC}" "")
-
diff --git a/features/frameworks/mbed-trace/CONTRIBUTING.md b/platform/mbed-trace/CONTRIBUTING.md
similarity index 100%
rename from features/frameworks/mbed-trace/CONTRIBUTING.md
rename to platform/mbed-trace/CONTRIBUTING.md
diff --git a/features/frameworks/mbed-trace/Jenkinsfile b/platform/mbed-trace/Jenkinsfile
similarity index 98%
rename from features/frameworks/mbed-trace/Jenkinsfile
rename to platform/mbed-trace/Jenkinsfile
index 2793e1c6bc..8ac585c242 100644
--- a/features/frameworks/mbed-trace/Jenkinsfile
+++ b/platform/mbed-trace/Jenkinsfile
@@ -82,7 +82,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
             execute("mbed --version")
             execute("echo https://github.com/armmbed/mbed-os/#6a0a86538c0b9b2bfcc4583b1e2b7fea8f4e71e9 > mbed-os.lib")
             execute("mbed deploy")
-            execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
+            execute("rm -rf ./mbed-os/platform/mbed-trace")
             execute("mbed compile -m ${target} -t ${toolchain} --library")
             setBuildStatus('SUCCESS', "build ${buildName}", "build done")
           } catch (err) {
@@ -102,7 +102,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
               execute("echo \"https://github.com/ARMmbed/mbed-trace#${env.GIT_COMMIT_HASH}\" > mbed-trace.lib")
               execute("mbed new .")
               execute("mbed deploy")
-              execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
+              execute("rm -rf ./mbed-os/platform/mbed-trace")
               execute("rm -rf ./mbed-trace/example")
               execute("rm -rf ./mbed-trace/test")
               execute("mbed compile -t ${toolchain} -m ${target}")
diff --git a/features/frameworks/mbed-trace/LICENSE b/platform/mbed-trace/LICENSE
similarity index 100%
rename from features/frameworks/mbed-trace/LICENSE
rename to platform/mbed-trace/LICENSE
diff --git a/features/frameworks/mbed-trace/Makefile.nanomesh b/platform/mbed-trace/Makefile.nanomesh
similarity index 100%
rename from features/frameworks/mbed-trace/Makefile.nanomesh
rename to platform/mbed-trace/Makefile.nanomesh
diff --git a/features/frameworks/mbed-trace/README.md b/platform/mbed-trace/README.md
similarity index 100%
rename from features/frameworks/mbed-trace/README.md
rename to platform/mbed-trace/README.md
diff --git a/features/frameworks/mbed-trace/mbed-trace/mbed_trace.h b/platform/mbed-trace/mbed-trace/mbed_trace.h
similarity index 100%
rename from features/frameworks/mbed-trace/mbed-trace/mbed_trace.h
rename to platform/mbed-trace/mbed-trace/mbed_trace.h
diff --git a/features/frameworks/mbed-trace/mbed_lib.json b/platform/mbed-trace/mbed_lib.json
similarity index 100%
rename from features/frameworks/mbed-trace/mbed_lib.json
rename to platform/mbed-trace/mbed_lib.json
diff --git a/features/frameworks/mbed-trace/source/CMakeLists.txt b/platform/mbed-trace/source/CMakeLists.txt
similarity index 100%
rename from features/frameworks/mbed-trace/source/CMakeLists.txt
rename to platform/mbed-trace/source/CMakeLists.txt
diff --git a/features/frameworks/mbed-trace/source/mbed_trace.c b/platform/mbed-trace/source/mbed_trace.c
similarity index 100%
rename from features/frameworks/mbed-trace/source/mbed_trace.c
rename to platform/mbed-trace/source/mbed_trace.c
diff --git a/storage/kvstore/source/FileSystemStore.cpp b/storage/kvstore/source/FileSystemStore.cpp
index 828ff5915b..7f5ad5d320 100644
--- a/storage/kvstore/source/FileSystemStore.cpp
+++ b/storage/kvstore/source/FileSystemStore.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mbed_trace.h"
+#include "mbed-trace/mbed_trace.h"
 #define TRACE_GROUP "FSST"
 
 #define FSST_REVISION 1
diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
index e9246278e9..30230a6aae 100644
--- a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
+++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
@@ -5,7 +5,7 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/frameworks/mbed-trace/mbed-trace
+  ../platform/mbed-trace/mbed-trace
 )
 
 set(unittest-sources
@@ -15,7 +15,7 @@ set(unittest-sources
   ../storage/filesystem/source/Dir.cpp
   ../storage/filesystem/source/File.cpp
   ../storage/filesystem/source/FileSystem.cpp
-  ../features/frameworks/mbed-trace/source/mbed_trace.c
+  ../platform/mbed-trace/source/mbed_trace.c
   ../storage/filesystem/littlefs/littlefs/lfs_util.c
   ../storage/filesystem/littlefs/littlefs/lfs.c
   ../platform/source/FileBase.cpp
diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
index 373173ef2d..dccc840777 100644
--- a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
+++ b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
@@ -6,7 +6,7 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/frameworks/mbed-trace/mbed-trace
+  ../platform/mbed-trace/mbed-trace
 )
 
 set(unittest-sources
@@ -14,7 +14,7 @@ set(unittest-sources
   ../storage/blockdevice/source/HeapBlockDevice.cpp
   ../storage/blockdevice/source/BufferedBlockDevice.cpp
   ../storage/kvstore/source/TDBStore.cpp
-  ../features/frameworks/mbed-trace/source/mbed_trace.c
+  ../platform/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
   stubs/mbed_error.c