diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57507d..212aa0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,10 @@
     endif()
 endif()
 
+if(BUILD_GREENTEA_TESTS)
+    include(mbed_greentea)
+endif()
+
 # These targets are made visible here so their source files which
 # are spread in different directories can be referenced and can be linked against
 # by libraries that depend on them.
diff --git a/hal/tests/TESTS/mbed_hal/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/CMakeLists.txt
index 403a9c7..1be1ec9 100644
--- a/hal/tests/TESTS/mbed_hal/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/CMakeLists.txt
@@ -1 +1,8 @@
+add_subdirectory(common_tickers)
+add_subdirectory(common_tickers_freq)
+add_subdirectory(crc)
+add_subdirectory(critical_section)
+add_subdirectory(flash/functional_tests)
+add_subdirectory(lp_ticker)
+add_subdirectory(minimum_requirements)
 add_subdirectory(reset_reason)
\ No newline at end of file
diff --git a/hal/tests/TESTS/mbed_hal/common_tickers/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/common_tickers/CMakeLists.txt
index b2e0db5..5af8414 100644
--- a/hal/tests/TESTS/mbed_hal/common_tickers/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/common_tickers/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-common-tickers)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
+	TEST_NAME
+		mbed-hal-common-tickers
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
 )
diff --git a/hal/tests/TESTS/mbed_hal/common_tickers_freq/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/common_tickers_freq/CMakeLists.txt
index 8561881..13caf67 100644
--- a/hal/tests/TESTS/mbed_hal/common_tickers_freq/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/common_tickers_freq/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-common-tickers-freq)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
+	TEST_NAME
+		mbed-hal-common-tickers-freq
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
 )
diff --git a/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt
index 25606ea..15902ac 100644
--- a/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-crc)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
-)
+	TEST_NAME
+		mbed-hal-crc
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
+)
\ No newline at end of file
diff --git a/hal/tests/TESTS/mbed_hal/critical_section/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/critical_section/CMakeLists.txt
index 03faeb9..c552d66 100644
--- a/hal/tests/TESTS/mbed_hal/critical_section/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/critical_section/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-critical-section)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
-)
+	TEST_NAME
+		mbed-hal-critical-section
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
+)
\ No newline at end of file
diff --git a/hal/tests/TESTS/mbed_hal/flash/functional_tests/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/flash/functional_tests/CMakeLists.txt
index fb04da3..33f0730 100644
--- a/hal/tests/TESTS/mbed_hal/flash/functional_tests/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/flash/functional_tests/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-flash-functional-tests)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
-)
+	TEST_NAME
+		mbed-hal-flash-functional-tests
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
+)
\ No newline at end of file
diff --git a/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp b/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp
index 3a64fe0..d2a5a75 100644
--- a/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp
+++ b/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp
@@ -102,7 +102,7 @@
 
     core_util_critical_section_exit();
 
-    return timer.read_us();
+    return std::chrono::duration_cast<std::chrono::microseconds>(timer.elapsed_time()).count();
 }
 
 void flash_init_test()
diff --git a/hal/tests/TESTS/mbed_hal/lp_ticker/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/lp_ticker/CMakeLists.txt
index b60c670..4f48b8f 100644
--- a/hal/tests/TESTS/mbed_hal/lp_ticker/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/lp_ticker/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-lp-ticker)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
-)
+	TEST_NAME
+		mbed-hal-lp-ticker
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
+)
\ No newline at end of file
diff --git a/hal/tests/TESTS/mbed_hal/minimum_requirements/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/minimum_requirements/CMakeLists.txt
index 70e8700..abee381 100644
--- a/hal/tests/TESTS/mbed_hal/minimum_requirements/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/minimum_requirements/CMakeLists.txt
@@ -1,18 +1,11 @@
 # Copyright (c) 2020 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-hal-minimum-requirements)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
-
 mbed_greentea_add_test(
-    TEST_NAME
-        ${TEST_TARGET}
-    TEST_SOURCES
-        main.cpp
+	TEST_NAME
+		mbed-hal-minimum-requirements
+	TEST_SOURCES
+		main.cpp
+	HOST_TESTS_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
 )
diff --git a/hal/tests/TESTS/mbed_hal/reset_reason/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/reset_reason/CMakeLists.txt
index deff47f..b60c9cb 100644
--- a/hal/tests/TESTS/mbed_hal/reset_reason/CMakeLists.txt
+++ b/hal/tests/TESTS/mbed_hal/reset_reason/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-include(mbed_greentea)
-
 mbed_greentea_add_test(
     TEST_NAME
 		mbed-hal-reset-reason
     TEST_SOURCES
         main.cpp
 	HOST_TESTS_DIR
-	    ../../host_tests
+	    ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests
 )