diff --git a/components/esp_driver_gptimer/test_apps/gptimer/main/test_gptimer_sleep.c b/components/esp_driver_gptimer/test_apps/gptimer/main/test_gptimer_sleep.c
index 7539e502a3..f95eef4783 100644
--- a/components/esp_driver_gptimer/test_apps/gptimer/main/test_gptimer_sleep.c
+++ b/components/esp_driver_gptimer/test_apps/gptimer/main/test_gptimer_sleep.c
@@ -152,7 +152,7 @@ static void test_gptimer_sleep_retention(bool back_up_before_sleep)
     TEST_ESP_OK(gptimer_get_raw_count(timer, &count_value_after_sleep));
     printf("gptimer count value: %llu\n", count_value_after_sleep);
     // the count value should near the reload value
-    TEST_ASSERT_INT_WITHIN(1, 5000, count_value_after_sleep);
+    TEST_ASSERT_INT_WITHIN(5, 5000, count_value_after_sleep);
 
     TEST_ESP_OK(gptimer_disable(timer));
     TEST_ESP_OK(gptimer_del_timer(timer));
diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
index bb690e7c15..554d1fa859 100644
--- a/components/esp_phy/src/phy_init.c
+++ b/components/esp_phy/src/phy_init.c
@@ -63,7 +63,7 @@ static const char* TAG = "phy_init";
 static _lock_t s_phy_access_lock;
 
 #if SOC_PM_SUPPORT_MODEM_PD || SOC_PM_SUPPORT_WIFI_PD
-#if SOC_PM_MODEM_PD_BY_SW
+#if SOC_PM_MODEM_PD_BY_SW // TODO: [ESP32C5] IDF-8667
 static DRAM_ATTR struct {
     int     count;  /* power on count of wifi and bt power domain */
     _lock_t lock;
@@ -337,7 +337,7 @@ void esp_phy_disable(esp_phy_modem_t modem)
 void IRAM_ATTR esp_wifi_bt_power_domain_on(void)
 {
 #if SOC_PM_SUPPORT_MODEM_PD || SOC_PM_SUPPORT_WIFI_PD
-#if SOC_PM_MODEM_PD_BY_SW
+#if SOC_PM_MODEM_PD_BY_SW // TODO: [ESP32C5] IDF-8667
     _lock_acquire(&s_wifi_bt_pd_controller.lock);
     if (s_wifi_bt_pd_controller.count++ == 0) {
         CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_PWC_REG, RTC_CNTL_WIFI_FORCE_PD);
@@ -362,7 +362,7 @@ void IRAM_ATTR esp_wifi_bt_power_domain_on(void)
 void esp_wifi_bt_power_domain_off(void)
 {
 #if SOC_PM_SUPPORT_MODEM_PD || SOC_PM_SUPPORT_WIFI_PD
-#if SOC_PM_MODEM_PD_BY_SW
+#if SOC_PM_MODEM_PD_BY_SW // TODO: [ESP32C5] IDF-8667
     _lock_acquire(&s_wifi_bt_pd_controller.lock);
     if (--s_wifi_bt_pd_controller.count == 0) {
         SET_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_WIFI_FORCE_ISO);
diff --git a/components/esp_pm/linker.lf b/components/esp_pm/linker.lf
index 8216d8a860..6fe90c1ff3 100644
--- a/components/esp_pm/linker.lf
+++ b/components/esp_pm/linker.lf
@@ -36,7 +36,7 @@ entries:
             sleep_system_peripheral:peripheral_domain_pd_allowed (noflash)
         sleep_modem:modem_domain_pd_allowed (noflash)
         sleep_modem:periph_inform_out_light_sleep_overhead (noflash)
-        if IDF_TARGET_ESP32P4 = n: # TODO: IDF-6496
+        if IDF_TARGET_ESP32P4 = n && IDF_TARGET_ESP32C61 = n : # TODO: IDF-6496, IDF-9304
             sar_periph_ctrl:sar_periph_ctrl_power_disable (noflash)
 
 [mapping:esp_system_pm]
diff --git a/components/esp_timer/test_apps/main/test_esp_timer.c b/components/esp_timer/test_apps/main/test_esp_timer.c
index 8717baedc3..afe70bed30 100644
--- a/components/esp_timer/test_apps/main/test_esp_timer.c
+++ b/components/esp_timer/test_apps/main/test_esp_timer.c
@@ -858,7 +858,7 @@ TEST_CASE("Test a latency between a call of callback and real event", "[esp_time
             vTaskDelay(10 / portTICK_PERIOD_MS);
         }
         int diff = callback_time - expected_time;
-        printf("%d us\n", diff);
+        esp_rom_printf(DRAM_STR("%d us\n"), diff);
 #ifndef CONFIG_IDF_ENV_FPGA
         if (i != 0) {
             // skip the first measurement
diff --git a/examples/system/esp_timer/pytest_esp_timer.py b/examples/system/esp_timer/pytest_esp_timer.py
index fe007f2251..929df5ccf1 100644
--- a/examples/system/esp_timer/pytest_esp_timer.py
+++ b/examples/system/esp_timer/pytest_esp_timer.py
@@ -28,8 +28,6 @@ ONE_SHOT_TIMER_PERIOD = 5000000
 
 
 @pytest.mark.supported_targets
-# TODO: [ESP32C61] IDF-10993
-@pytest.mark.temp_skip_ci(targets=['esp32c61'], reason='C61 has not supported light sleep')
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
diff --git a/examples/system/light_sleep/pytest_light_sleep.py b/examples/system/light_sleep/pytest_light_sleep.py
index e4fe3b65f1..3aade876e8 100644
--- a/examples/system/light_sleep/pytest_light_sleep.py
+++ b/examples/system/light_sleep/pytest_light_sleep.py
@@ -8,7 +8,6 @@ from pytest_embedded import Dut
 
 
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c61'], reason='not supported light sleep')  # TODO: [ESP32C61] IDF-9247 IDF-10993
 @pytest.mark.generic
 def test_light_sleep(dut: Dut) -> None: