diff --git a/.travis.yml b/.travis.yml
index f589a8ba97..985e28f1e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -253,7 +253,7 @@ matrix:
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
-          rm -r rtos drivers/source/usb features/cellular features/netsocket features/nanostack \
+          rm -r rtos/source/TARGET_CORTEX drivers/source/usb features/cellular features/netsocket features/nanostack \
             features/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
index 82f475a2b5..c93170ffe7 100644
--- a/TESTS/configs/baremetal.json
+++ b/TESTS/configs/baremetal.json
@@ -1,7 +1,6 @@
 {
     "requires": [
         "bare-metal",
-        "rtos-api",
         "greentea-client",
         "utest",
         "unity",
diff --git a/platform/bare_metal/mbed_lib.json b/platform/bare_metal/mbed_lib.json
index 8a995c063d..fadb1519c1 100644
--- a/platform/bare_metal/mbed_lib.json
+++ b/platform/bare_metal/mbed_lib.json
@@ -1,4 +1,4 @@
 {
   "name": "bare-metal",
-  "requires": ["platform", "drivers"]
+  "requires": ["platform", "drivers", "rtos-api"]
 }