diff --git a/components/driver/.build-test-rules.yml b/components/driver/.build-test-rules.yml
index 84d13b4918..7a3c77dd99 100644
--- a/components/driver/.build-test-rules.yml
+++ b/components/driver/.build-test-rules.yml
@@ -73,6 +73,24 @@ components/driver/test_apps/sdm:
   disable:
     - if: SOC_SDM_SUPPORTED != 1
 
+components/driver/test_apps/spi/master:
+  disable:
+    - if: IDF_TARGET == "esp32c6"
+      temporary: true
+      reason: target esp32c6 is not supported yet
+
+components/driver/test_apps/spi/slave:
+  disable:
+    - if: IDF_TARGET == "esp32c6"
+      temporary: true
+      reason: target esp32c6 is not supported yet
+
+components/driver/test_apps/spi/slave_hd:
+  disable:
+    - if: IDF_TARGET == "esp32c6"
+      temporary: true
+      reason: target esp32c6 is not supported yet
+
 components/driver/test_apps/temperature_sensor:
   disable:
     - if: SOC_TEMP_SENSOR_SUPPORTED != 1
diff --git a/components/driver/test_apps/spi/master/README.md b/components/driver/test_apps/spi/master/README.md
index 2beabff547..284564238d 100644
--- a/components/driver/test_apps/spi/master/README.md
+++ b/components/driver/test_apps/spi/master/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
\ No newline at end of file
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
\ No newline at end of file
diff --git a/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c b/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c
index c1a04a3959..e859a29f06 100644
--- a/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c
+++ b/components/driver/test_apps/spi/master/main/test_spi_bus_lock.c
@@ -45,7 +45,6 @@ typedef struct {
 } task_context_t;
 
 #if !(CONFIG_SPIRAM && CONFIG_IDF_TARGET_ESP32)
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
 
 const static char TAG[] = "test_spi";
 
@@ -349,5 +348,4 @@ TEST_CASE("spi master can be used on SPI1", "[spi]")
 
 //TODO: add a case when a non-polling transaction happened in the bus-acquiring time and then release the bus then queue a new trans
 
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
 #endif //!(CONFIG_SPIRAM && CONFIG_IDF_TARGET_ESP32)
diff --git a/components/driver/test_apps/spi/master/main/test_spi_sio.c b/components/driver/test_apps/spi/master/main/test_spi_sio.c
index e853c88817..02cd852fc8 100644
--- a/components/driver/test_apps/spi/master/main/test_spi_sio.c
+++ b/components/driver/test_apps/spi/master/main/test_spi_sio.c
@@ -143,7 +143,6 @@ TEST_CASE("SPI Single Board Test SIO", "[spi]")
 #endif //#if (TEST_SPI_PERIPH_NUM >= 2)
 
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
 /********************************************************************************
  *                             Test SIO Master
  * SIO Slave is not suported, and one unit test is limited to one feature, so,,,
@@ -327,4 +326,3 @@ void test_slave_run(void)
 }
 
 TEST_CASE_MULTIPLE_DEVICES("SPI_Master:Test_SIO_Mode_Multi_Board", "[spi_ms][test_env=generic_multi_device]", test_master_run, test_slave_run);
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
diff --git a/components/driver/test_apps/spi/slave/README.md b/components/driver/test_apps/spi/slave/README.md
index 2beabff547..284564238d 100644
--- a/components/driver/test_apps/spi/slave/README.md
+++ b/components/driver/test_apps/spi/slave/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
\ No newline at end of file
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
\ No newline at end of file
diff --git a/components/driver/test_apps/spi/slave_hd/README.md b/components/driver/test_apps/spi/slave_hd/README.md
index 2beabff547..284564238d 100644
--- a/components/driver/test_apps/spi/slave_hd/README.md
+++ b/components/driver/test_apps/spi/slave_hd/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
\ No newline at end of file
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- |
\ No newline at end of file
diff --git a/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c b/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c
index eb2eade9b2..971f794b4c 100644
--- a/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c
+++ b/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c
@@ -589,7 +589,6 @@ TEST_CASE("test spi slave hd segment mode, master too long", "[spi][spi_slv_hd]"
 
 #endif //#if (TEST_SPI_PERIPH_NUM >= 2)
 
-
 #if (TEST_SPI_PERIPH_NUM == 1)
 //These tests are for chips which only have 1 SPI controller
 /********************************************************************************
diff --git a/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c b/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
index c5fca8b290..01aa7bc743 100644
--- a/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
+++ b/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
@@ -347,7 +347,7 @@ TEST_CASE("Test starting 'External 32kHz XTAL' on the board without it.", "[test
 
 #endif // !defined(CONFIG_IDF_CI_BUILD) || !CONFIG_SPIRAM_BANKSWITCH_ENABLE
 
-#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3)
+#endif // !TEMPORARY_DISABLED_FOR_TARGETS(...)
 
 #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
 //IDF-5060
diff --git a/components/esp_netif/test/test_esp_netif.c b/components/esp_netif/test/test_esp_netif.c
index 45a10c44a8..8a5d164cec 100644
--- a/components/esp_netif/test/test_esp_netif.c
+++ b/components/esp_netif/test/test_esp_netif.c
@@ -76,7 +76,7 @@ TEST_CASE("esp_netif: create and delete multiple netifs", "[esp_netif][leaks=0]"
 }
 
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6)
 //IDF-5047
 
 TEST_CASE("esp_netif: test dhcp client state transitions for wifi station", "[esp_netif]")
@@ -302,7 +302,7 @@ TEST_CASE("esp_netif: get/set hostname", "[esp_netif]")
     esp_netif_destroy(esp_netif);
 }
 
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(...)
 
 TEST_CASE("esp_netif: convert ip address from string", "[esp_netif]")
 {
@@ -328,7 +328,7 @@ TEST_CASE("esp_netif: convert ip address from string", "[esp_netif]")
     TEST_ASSERT_EQUAL(ESP_ERR_INVALID_ARG, esp_netif_str_to_ip6(ipv6_src[0], NULL));
 }
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6)
 //IDF-5047
 TEST_CASE("esp_netif: create and destroy default wifi interfaces", "[esp_netif][leaks=0]")
 {
@@ -365,7 +365,7 @@ TEST_CASE("esp_netif: create and destroy default wifi interfaces", "[esp_netif][
 }
 
 
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(...)
 
 static esp_err_t dummy_transmit(void* hd, void *buf, size_t length)
 {
diff --git a/components/esp_phy/test/test_phy_rtc.c b/components/esp_phy/test/test_phy_rtc.c
index ad04b462f8..6173f648e4 100644
--- a/components/esp_phy/test/test_phy_rtc.c
+++ b/components/esp_phy/test/test_phy_rtc.c
@@ -14,7 +14,7 @@
 #include "esp_private/wifi.h"
 
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6)
 //IDF-5046
 #include "esp_phy_init.h"
 
@@ -132,6 +132,6 @@ TEST_CASE("Test PHY/RTC functions called when cache is disabled", "[phy_rtc][cac
 
     vSemaphoreDelete(semphr_done);
 }
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32C3)
 
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(...)
diff --git a/components/esp_system/test/test_reset_reason.c b/components/esp_system/test/test_reset_reason.c
index b5dd7c0524..7beea25b06 100644
--- a/components/esp_system/test/test_reset_reason.c
+++ b/components/esp_system/test/test_reset_reason.c
@@ -60,7 +60,7 @@ TEST_CASE("reset reason ESP_RST_POWERON", "[reset][ignore]")
 }
 
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6)
 //IDF-5059
 static __NOINIT_ATTR uint32_t s_noinit_val;
 static RTC_NOINIT_ATTR uint32_t s_rtc_noinit_val;
@@ -305,7 +305,7 @@ TEST_CASE_MULTIPLE_STAGES("reset reason ESP_RST_BROWNOUT after brownout event",
         do_brownout,
         check_reset_reason_brownout);
 
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(...)
 
 
 #ifdef CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY
diff --git a/components/esp_system/test/test_sleep.c b/components/esp_system/test/test_sleep.c
index 1a9e2d4df0..d2564ff79a 100644
--- a/components/esp_system/test/test_sleep.c
+++ b/components/esp_system/test/test_sleep.c
@@ -34,6 +34,7 @@
 
 __attribute__((unused)) static struct timeval tv_start, tv_stop;
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
 #ifndef CONFIG_FREERTOS_UNICORE
 static void deep_sleep_task(void *arg)
 {
@@ -590,3 +591,4 @@ TEST_CASE("wake up using GPIO (2 or 4 low)", "[deepsleep][ignore]")
 }
 #endif // SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP
 #endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) TODO: IDF-5348, IDF-5349
diff --git a/components/mqtt/test/test_mqtt5.c b/components/mqtt/test/test_mqtt5.c
index 1ea75e1fbb..6b052759ae 100644
--- a/components/mqtt/test/test_mqtt5.c
+++ b/components/mqtt/test/test_mqtt5.c
@@ -19,6 +19,7 @@
 #include "esp_mac.h"
 #include "esp_partition.h"
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
 static esp_mqtt5_user_property_item_t user_property_arr[3] = {
     {"board", "esp32"},
     {"u", "user"},
@@ -150,3 +151,4 @@ TEST_CASE("mqtt5 broker tests", "[mqtt5][test_env=UT_T2_Ethernet]")
     connect_test_fixture_teardown();
 }
 #endif // SOC_EMAC_SUPPORTED
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
diff --git a/components/newlib/test/test_time.c b/components/newlib/test/test_time.c
index 8454b53546..1666868e92 100644
--- a/components/newlib/test/test_time.c
+++ b/components/newlib/test/test_time.c
@@ -14,7 +14,6 @@
 #include "freertos/semphr.h"
 #include "sdkconfig.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "esp_system.h"
 #include "test_utils.h"
 #include "esp_log.h"
@@ -45,6 +44,7 @@
 #endif
 
 #if portNUM_PROCESSORS == 2
+#include "soc/rtc_cntl_reg.h"
 
 // This runs on APP CPU:
 static void time_adc_test_task(void* arg)
diff --git a/components/vfs/test/test_vfs_uart.c b/components/vfs/test/test_vfs_uart.c
index 83a356d23c..86480bb33a 100644
--- a/components/vfs/test/test_vfs_uart.c
+++ b/components/vfs/test/test_vfs_uart.c
@@ -16,7 +16,7 @@
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "driver/uart.h"
-#include "soc/uart_struct.h"
+#include "hal/uart_ll.h"
 #include "esp_vfs_dev.h"
 #include "esp_vfs.h"
 #include "test_utils.h"
@@ -25,12 +25,12 @@
 static void fwrite_str_loopback(const char* str, size_t size)
 {
     esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
-    UART0.conf0.loopback = 1;
+    uart_ll_set_loop_back(&UART0, 1);
     fwrite(str, 1, size, stdout);
     fflush(stdout);
     esp_rom_uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
     vTaskDelay(2 / portTICK_PERIOD_MS);
-    UART0.conf0.loopback = 0;
+    uart_ll_set_loop_back(&UART0, 0);
 }
 
 static void flush_stdin_stdout(void)
diff --git a/components/wpa_supplicant/test/test_eloop.c b/components/wpa_supplicant/test/test_eloop.c
index a10f3287c6..bb1c06c267 100644
--- a/components/wpa_supplicant/test/test_eloop.c
+++ b/components/wpa_supplicant/test/test_eloop.c
@@ -18,6 +18,7 @@
 #include "memory_checks.h"
 #include <time.h>
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
 uint32_t timeouts_usec[6] = { 10000, 1000, 10000, 5000, 15000, 1000 };
 uint32_t timeouts_sec[6] = { 10, 1, 10, 5, 15, 1 };
 int executed_order[6];
@@ -82,3 +83,4 @@ TEST_CASE("Test eloop timers run", "[eloop]")
 	TEST_ESP_OK(esp_wifi_deinit());
 	os_sleep(3, 0);
 }
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
diff --git a/components/wpa_supplicant/test/test_offchannel.c b/components/wpa_supplicant/test/test_offchannel.c
index a492cb3ce4..05458a4b4c 100644
--- a/components/wpa_supplicant/test/test_offchannel.c
+++ b/components/wpa_supplicant/test/test_offchannel.c
@@ -32,7 +32,7 @@
 #define TEST_LISTEN_CHANNEL     6
 
 /* No runners */
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3, ESP32C2, ESP32C6)
 //IDF-5046
 static const char *TAG = "test_offchan";
 esp_netif_t *wifi_netif;
@@ -242,4 +242,4 @@ static void test_wifi_roc(void)
 
 TEST_CASE_MULTIPLE_DEVICES("test ROC and Offchannel Action Frame Tx", "[Offchan][test_env=UT_T2_1][timeout=90]", test_wifi_roc, test_wifi_offchan_tx);
 
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3, ESP32C3)
+#endif //!TEMPORARY_DISABLED_FOR_TARGETS(...)