diff --git a/components/esp_hal_uart/esp32s31/include/hal/uart_ll.h b/components/esp_hal_uart/esp32s31/include/hal/uart_ll.h
index 091935e7bfe..381fb94f5d7 100644
--- a/components/esp_hal_uart/esp32s31/include/hal/uart_ll.h
+++ b/components/esp_hal_uart/esp32s31/include/hal/uart_ll.h
@@ -1234,7 +1234,23 @@ FORCE_INLINE_ATTR void uart_ll_set_wakeup_fifo_thrd(uart_dev_t *hw, uint32_t wak
  */
 FORCE_INLINE_ATTR void uart_ll_set_wakeup_mode(uart_dev_t *hw, uart_wakeup_mode_t mode)
 {
-
+    switch (mode) {
+    case UART_WK_MODE_ACTIVE_THRESH:
+        hw->sleep_conf2.wk_mode_sel = 0;
+        break;
+    case UART_WK_MODE_FIFO_THRESH:
+        hw->sleep_conf2.wk_mode_sel = 1;
+        break;
+    case UART_WK_MODE_START_BIT:
+        hw->sleep_conf2.wk_mode_sel = 2;
+        break;
+    case UART_WK_MODE_CHAR_SEQ:
+        hw->sleep_conf2.wk_mode_sel = 3;
+        break;
+    default:
+        abort();
+        break;
+    }
 }
 
 /**
@@ -1287,6 +1303,9 @@ FORCE_INLINE_ATTR void uart_ll_set_char_seq_wk_char(uart_dev_t *hw, uint32_t cha
     case 3:
         HAL_FORCE_MODIFY_U32_REG_FIELD(hw->sleep_conf0, wk_char3, value);
         break;
+    case 4:
+        HAL_FORCE_MODIFY_U32_REG_FIELD(hw->sleep_conf0, wk_char4, value);
+        break;
     default:
         abort();
         break;
diff --git a/components/ulp/test_apps/lp_core/lp_core_basic_tests/pytest_lp_core_basic.py b/components/ulp/test_apps/lp_core/lp_core_basic_tests/pytest_lp_core_basic.py
index 0bb7325637e..630c499426d 100644
--- a/components/ulp/test_apps/lp_core/lp_core_basic_tests/pytest_lp_core_basic.py
+++ b/components/ulp/test_apps/lp_core/lp_core_basic_tests/pytest_lp_core_basic.py
@@ -51,7 +51,6 @@ def test_lp_vad(dut: Dut) -> None:
 
 
 @pytest.mark.generic_multi_device
-@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='TODO IDF-15572 Enable ULP multi device tests for ESP32-S31')
 @pytest.mark.parametrize('count', [2], indirect=True)
 @pytest.mark.parametrize(
     'config',
@@ -79,7 +78,6 @@ def test_lp_core_multi_device(case_tester: CaseTester) -> None:
     indirect=True,
 )
 @idf_parametrize('target', soc_filtered_targets('SOC_ULP_LP_UART_SUPPORTED == 1'), indirect=['target'])
-@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='TODO IDF-15572 Enable ULP multi device tests for ESP32-S31')
 def test_lp_uart_multi_device(case_tester: CaseTester) -> None:
     uart_cases = [case for case in case_tester.test_menu if 'uart' in case.groups and 'wakeup' not in case.groups]
     for case in uart_cases:
@@ -87,7 +85,6 @@ def test_lp_uart_multi_device(case_tester: CaseTester) -> None:
 
 
 @pytest.mark.generic_multi_device
-@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='TODO IDF-15572 Enable ULP multi device tests for ESP32-S31')
 @pytest.mark.parametrize(
     'target',
     soc_filtered_targets('SOC_ULP_LP_UART_SUPPORTED == 1'),