diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
index 3af169e0f1..9f442a42fc 100644
--- a/hal/CMakeLists.txt
+++ b/hal/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
     if(BUILD_GREENTEA_TESTS)
-        # add greentea test
+        add_subdirectory(tests/TESTS)
     else()
         add_subdirectory(tests/UNITTESTS)
     endif()
diff --git a/hal/tests/TESTS/CMakeLists.txt b/hal/tests/TESTS/CMakeLists.txt
new file mode 100644
index 0000000000..f7e5adafa3
--- /dev/null
+++ b/hal/tests/TESTS/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(mbed_hal/common_tickers)
+add_subdirectory(mbed_hal/common_tickers_freq)
+add_subdirectory(mbed_hal/crc)
+add_subdirectory(mbed_hal/critical_section)
+add_subdirectory(mbed_hal/flash/functional_tests)
+add_subdirectory(mbed_hal/lp_ticker)
+add_subdirectory(mbed_hal/minimum_requirements)
+add_subdirectory(mbed_hal/mpu)
+add_subdirectory(mbed_hal/pinmap)
+add_subdirectory(mbed_hal/reset_reason)
+add_subdirectory(mbed_hal/rtc)
+add_subdirectory(mbed_hal/rtc_reset)
+add_subdirectory(mbed_hal/rtc_time)
+add_subdirectory(mbed_hal/rtc_time_conv)
+add_subdirectory(mbed_hal/sleep)
+add_subdirectory(mbed_hal/sleep_manager)
+add_subdirectory(mbed_hal/sleep_manager_racecondition)
+add_subdirectory(mbed_hal/ticker)
+add_subdirectory(mbed_hal/trng)
+add_subdirectory(mbed_hal/us_ticker)
+add_subdirectory(mbed_hal/watchdog)
+add_subdirectory(mbed_hal/watchdog_reset)
+add_subdirectory(mbed_hal/watchdog_timing)
+add_subdirectory(mbed_hal/qspi)
+add_subdirectory(mbed_hal/ospi)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/analogin)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/gpio)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/gpio_irq)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/i2c)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/pwm)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/spi)
+add_subdirectory(mbed_hal_fpga_ci_test_shield/uart)
+add_subdirectory(mbed_timing_fpga_ci_test_shield/watchdog)
+add_subdirectory(pin_names/arduino_uno)
+add_subdirectory(pin_names/generic)