diff --git a/drivers/tests/TESTS/mbed_drivers/generic_tests/main.cpp b/drivers/tests/TESTS/mbed_drivers/generic_tests/main.cpp
index 6c30816dc8..d00d0e1f85 100644
--- a/drivers/tests/TESTS/mbed_drivers/generic_tests/main.cpp
+++ b/drivers/tests/TESTS/mbed_drivers/generic_tests/main.cpp
@@ -76,6 +76,7 @@ void test_case_basic()
                              "The quick brown fox jumps over the lazy dog");
 }
 
+#ifdef LED1
 void test_case_blinky()
 {
     static DigitalOut myled(LED1);
@@ -84,6 +85,7 @@ void test_case_blinky()
         myled = !myled;
     }
 }
+#endif
 
 void test_case_cpp_stack()
 {
@@ -113,7 +115,9 @@ utest::v1::status_t greentea_failure_handler(const Case *const source, const fai
 // Generic test cases
 Case cases[] = {
     Case("Basic", test_case_basic, greentea_failure_handler),
+#ifdef LED1
     Case("Blinky", test_case_blinky, greentea_failure_handler),
+#endif
     Case("C++ stack", test_case_cpp_stack, greentea_failure_handler),
     Case("C++ heap", test_case_cpp_heap, greentea_failure_handler)
 };
diff --git a/events/tests/TESTS/events/timing/main.cpp b/events/tests/TESTS/events/timing/main.cpp
index fb0b759b30..2087e2895e 100644
--- a/events/tests/TESTS/events/timing/main.cpp
+++ b/events/tests/TESTS/events/timing/main.cpp
@@ -59,7 +59,6 @@ float chisq(float sigma)
 
 
 Timer timer;
-DigitalOut led(LED1);
 
 equeue_sema_t sema;
 
@@ -120,8 +119,6 @@ void semaphore_timing_test()
         }
 
         TEST_ASSERT_INT_WITHIN(5000, taken, delay * 1000);
-
-        led = !led;
     }
 
     equeue_sema_destroy(&sema);
diff --git a/hal/tests/TESTS/pin_names/generic/main.cpp b/hal/tests/TESTS/pin_names/generic/main.cpp
index b498bf97b6..ae2f96ebad 100644
--- a/hal/tests/TESTS/pin_names/generic/main.cpp
+++ b/hal/tests/TESTS/pin_names/generic/main.cpp
@@ -24,8 +24,8 @@
 Requirements specified in docs/design-documents/hal/0004-pin-names-general-guidelines.md
 */
 
-#ifndef LED1
-#error [NOT_SUPPORTED] Target is not following mbed-os pin names standard // Test is set as Skipped
+#if !defined LED1 && !defined BUTTON1
+#error [NOT_SUPPORTED] Target doesn't have any LED and BUTTON
 #else
 
 using namespace utest::v1;