diff --git a/components/esp_driver_spi/test_apps/param/main/test_spi_param.c b/components/esp_driver_spi/test_apps/param/main/test_spi_param.c
index 020df8e860a..160c711e105 100644
--- a/components/esp_driver_spi/test_apps/param/main/test_spi_param.c
+++ b/components/esp_driver_spi/test_apps/param/main/test_spi_param.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1276,7 +1276,7 @@ static void test_master_fd_dma(void)
                     .spics_io_num = PIN_NUM_CS,
                     .queue_size = 16,
                     .clock_speed_hz = s_spi_bus_freq[speed_level],
-                    .cs_ena_pretrans = 2,
+                    .cs_ena_pretrans = 5,
                 };
 #if CONFIG_IDF_TARGET_ESP32
                 if (is_gpio && (s_spi_bus_freq[speed_level] >= 10 * 1000 * 1000)) {
@@ -1391,7 +1391,7 @@ static void test_master_fd_no_dma(void)
                     .spics_io_num = PIN_NUM_CS,
                     .queue_size = 16,
                     .clock_speed_hz = s_spi_bus_freq[speed_level],
-                    .cs_ena_pretrans = 2,
+                    .cs_ena_pretrans = 5,
                 };
 #if CONFIG_IDF_TARGET_ESP32
                 if (is_gpio && (s_spi_bus_freq[speed_level] >= 10 * 1000 * 1000)) {
@@ -1506,7 +1506,7 @@ static void test_master_hd_dma(void)
                 spi_device_interface_config_t devcfg = {
                     .spics_io_num = PIN_NUM_CS,
                     .clock_speed_hz = s_spi_bus_freq[speed_level],
-                    .cs_ena_pretrans = 2,
+                    .cs_ena_pretrans = 5,
                     .mode = mode,
                     .flags = SPI_DEVICE_HALFDUPLEX,
                     .command_bits = 8,
@@ -1615,7 +1615,7 @@ static void test_master_hd_no_dma(void)
                 spi_device_interface_config_t devcfg = {
                     .spics_io_num = PIN_NUM_CS,
                     .clock_speed_hz = s_spi_bus_freq[speed_level],
-                    .cs_ena_pretrans = 2,
+                    .cs_ena_pretrans = 5,
                     .mode = mode,
                     .flags = SPI_DEVICE_HALFDUPLEX,
                     .command_bits = 8,
@@ -1739,7 +1739,7 @@ static void test_master_sio_dma(void)
                     .spics_io_num = PIN_NUM_CS,
                     .queue_size = 16,
                     .clock_speed_hz = s_spi_bus_freq[speed_level],
-                    .cs_ena_pretrans = 2,
+                    .cs_ena_pretrans = 5,
                     .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
                 };
 #if CONFIG_IDF_TARGET_ESP32
@@ -1869,7 +1869,7 @@ static void test_master_sio_no_dma(void)
                     .mode = mode,
                     .spics_io_num = PIN_NUM_CS,
                     .queue_size = 16,
-                    .cs_ena_pretrans = 2,
+                    .cs_ena_pretrans = 5,
                     .clock_speed_hz = s_spi_bus_freq[speed_level],
                     .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
                 };
diff --git a/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py b/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py
index a3716f23c22..c7469393f1c 100644
--- a/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py
+++ b/components/esp_hw_support/test_apps/wakeup_tests/pytest_wakeup_tests.py
@@ -19,6 +19,7 @@ available_gpio_nums = {
     'esp32c6': [0, 1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 15, 18, 19, 20, 21, 22, 23],
     'esp32h2': [0, 1, 2, 3, 4, 5, 10, 11, 12, 22, 25, 26, 27],
     'esp32p4': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
+    + [18, 19, 20, 21, 22, 23, 39, 40, 41, 42, 43, 45, 46, 47, 48]
     + [28, 29, 30, 31, 32, 33, 36, 49, 50, 51, 52, 53, 54],
     'esp32c5': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 13, 14, 23, 24, 25, 26],
     'esp32c61': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 22, 23, 24, 25, 26, 27, 28, 29],