diff --git a/components/esp_system/test/test_sleep.c b/components/esp_system/test/test_sleep.c
index 23f192c9f7..0871cefd87 100644
--- a/components/esp_system/test/test_sleep.c
+++ b/components/esp_system/test/test_sleep.c
@@ -84,7 +84,6 @@ TEST_CASE("wake up from light sleep using timer", "[deepsleep]")
                (tv_stop.tv_usec - tv_start.tv_usec) * 1e-3f;
     TEST_ASSERT_INT32_WITHIN(500, 2000, (int) dt);
 }
-#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3)
 
 static void test_light_sleep(void* arg)
 {
diff --git a/examples/system/esp_event/default_event_loop/example_test.py b/examples/system/esp_event/default_event_loop/example_test.py
index 4060071741..e53e13a6ef 100644
--- a/examples/system/esp_event/default_event_loop/example_test.py
+++ b/examples/system/esp_event/default_event_loop/example_test.py
@@ -81,7 +81,7 @@ def _test_iteration_events(dut):
     print('Deleted task event source')
 
 
-@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32'])
+@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32', 'esp32c3'])
 def test_default_event_loop_example(env, extra_data):
     dut = env.get_dut('default_event_loop', 'examples/system/esp_event/default_event_loop')
 
diff --git a/examples/system/light_sleep/README.md b/examples/system/light_sleep/README.md
index 6f59910891..c9212067c6 100644
--- a/examples/system/light_sleep/README.md
+++ b/examples/system/light_sleep/README.md
@@ -1,5 +1,3 @@
-| Supported Targets | ESP32 | ESP32-S2 |
-| ----------------- | ----- | -------- |
 # Light Sleep Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/system/light_sleep/example_test.py b/examples/system/light_sleep/example_test.py
index 225ad499d1..5a6d3e1e0c 100644
--- a/examples/system/light_sleep/example_test.py
+++ b/examples/system/light_sleep/example_test.py
@@ -7,12 +7,12 @@ import ttfw_idf
 
 ENTERING_SLEEP_STR = 'Entering light sleep'
 EXIT_SLEEP_REGEX = re.compile(r'Returned from light sleep, reason: (\w+), t=(\d+) ms, slept for (\d+) ms')
-WAITING_FOR_GPIO_STR = 'Waiting for GPIO0 to go high...'
+WAITING_FOR_GPIO_STR = re.compile(r'Waiting for GPIO\d to go high...')
 
 WAKEUP_INTERVAL_MS = 2000
 
 
-@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32'])
+@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32', 'esp32c3'])
 def test_examples_system_light_sleep(env, extra_data):
     dut = env.get_dut('light_sleep_example', 'examples/system/light_sleep')
     dut.start_app()
diff --git a/examples/system/light_sleep/main/light_sleep_example_main.c b/examples/system/light_sleep/main/light_sleep_example_main.c
index 4fc9fe4b00..4e979b1ece 100644
--- a/examples/system/light_sleep/main/light_sleep_example_main.c
+++ b/examples/system/light_sleep/main/light_sleep_example_main.c
@@ -29,7 +29,7 @@
 #define BUTTON_GPIO_NUM_DEFAULT     0
 #endif
 
-/* "Boot" button on GPIO0 is active low */
+/* "Boot" button is active low */
 #define BUTTON_WAKEUP_LEVEL_DEFAULT     0
 
 void app_main(void)