diff --git a/hal/tests/TESTS/pin_names/arduino_uno/CMakeLists.txt b/hal/tests/TESTS/pin_names/arduino_uno/CMakeLists.txt
new file mode 100644
index 0000000000..f6aab968b7
--- /dev/null
+++ b/hal/tests/TESTS/pin_names/arduino_uno/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+include(mbed_greentea)
+
+if(NOT "TARGET_FF_ARDUINO_UNO" IN_LIST MBED_TARGET_DEFINITIONS)
+    set(TEST_SKIPPED "Test needs Arduino Uno form factor")
+endif()
+
+mbed_greentea_add_test(
+    TEST_NAME
+        mbed-hal-pin-names-arduino_uno
+    TEST_SOURCES
+        main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
+)
diff --git a/hal/tests/TESTS/pin_names/generic/CMakeLists.txt b/hal/tests/TESTS/pin_names/generic/CMakeLists.txt
new file mode 100644
index 0000000000..b68cb07776
--- /dev/null
+++ b/hal/tests/TESTS/pin_names/generic/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+include(mbed_greentea)
+
+# This test is enabled via CMake command-line argument -DMBED_HAL_PIN_NAMES_GENERIC_TEST=ON.
+if(NOT MBED_HAL_PIN_NAMES_GENERIC_TEST)
+    set(TEST_SKIPPED "Pin names generic test is not enabled for this Target")
+endif()
+
+mbed_greentea_add_test(
+    TEST_NAME
+        mbed-hal-pin-names-generic
+    TEST_SOURCES
+        main.cpp
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
+)