diff --git a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt
index 9794b7c..30bef73 100644
--- a/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/MemoryPool/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-memorypool)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-memorypool
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt
index 3c9b8cb..496ef6f 100644
--- a/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/basic/CMakeLists.txt
@@ -1,18 +1,13 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-basic)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-basic
     TEST_SOURCES
         main.cpp
+    HOST_TESTS_DIR
+        "${CMAKE_CURRENT_LIST_DIR}/../../host_tests"
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt
index 57e3ef1..33028d7 100644
--- a/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/condition_variable/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-condition-variable)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-condition-variable
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt
index 94460f1..5961bb8 100644
--- a/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/event_flags/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-event-flags)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-event-flags
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt
index dd93b95..de7dee1 100644
--- a/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/heap_and_stack/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-heap-and-stack)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-heap-and-stack
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt
index c95ca86..5ffd93f 100644
--- a/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/kernel_tick_count/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-kernel-tick-count)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-kernel-tick-count
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt
index 26feb9f..d548420 100644
--- a/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/mail/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-mail)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-mail
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt
index 78b0310..b82b329 100644
--- a/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/malloc/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-malloc)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-malloc
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt
index 8734d6c..5903f82 100644
--- a/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/mutex/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-mutex)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-mutex
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt
index 9c90819..41cd627 100644
--- a/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/queue/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-queue)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-queue
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt
index d718b92..515f402 100644
--- a/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/semaphore/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-semaphore)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-semaphore
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt
index cca7ed5..7c95f43 100644
--- a/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/signals/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-signals)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-signals
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt
index 0606dfb..0c2d56c 100644
--- a/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/systimer/CMakeLists.txt
@@ -1,18 +1,11 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-systimer)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-systimer
     TEST_SOURCES
         main.cpp
 )
diff --git a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt
index 8499ab3..bdf12b8 100644
--- a/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt
+++ b/rtos/tests/TESTS/mbed_rtos/threads/CMakeLists.txt
@@ -1,18 +1,13 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
-
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-rtos-threads)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+include(mbed_greentea)
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-rtos-threads
+    TEST_INCLUDE_DIRS
+        .
     TEST_SOURCES
         main.cpp
 )