diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml
index 23a03fe094a..39bac60b7a2 100644
--- a/examples/wifi/.build-test-rules.yml
+++ b/examples/wifi/.build-test-rules.yml
@@ -86,6 +86,7 @@ examples/wifi/power_save:
     - if: SOC_WIFI_SUPPORTED != 1
       temporary: true
       reason: requires hardware support
+  disable_test:
     - if: IDF_TARGET in ["esp32s31"]
       temporary: true
       reason: lack of runners
diff --git a/examples/wifi/power_save/README.md b/examples/wifi/power_save/README.md
index af44ff0d2c0..6dd43975d79 100644
--- a/examples/wifi/power_save/README.md
+++ b/examples/wifi/power_save/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 | ESP32-S31 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | --------- |
 
 # Wifi Power Save Example
 
diff --git a/examples/wifi/power_save/sdkconfig.defaults.esp32s31 b/examples/wifi/power_save/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..f001497d140
--- /dev/null
+++ b/examples/wifi/power_save/sdkconfig.defaults.esp32s31
@@ -0,0 +1,2 @@
+# ESP32-S31 does not support 80 MHz; use the lowest available CPU frequency
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
diff --git a/tools/ci/ignore_build_warnings.txt b/tools/ci/ignore_build_warnings.txt
index 4dae47de886..2dcb94a0120 100644
--- a/tools/ci/ignore_build_warnings.txt
+++ b/tools/ci/ignore_build_warnings.txt
@@ -23,6 +23,7 @@ warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BTDM' assigned to*
 warning: unknown kconfig symbol 'CTRL_BTDM_MODEM_SLEEP' assigned to*
 warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/system/deep_sleep/*
 warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/system/light_sleep/*
+warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/wifi/power_save/*
 warning: unknown kconfig symbol 'ESP32_REV_MIN_3' assigned to 'y' in .*/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa
 warning: unknown kconfig symbol 'ESP32_REV_MIN' assigned to '3' in .*/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa
 warning: unknown kconfig symbol 'ESP32H4_RTC_CLK_CAL_CYCLES' assigned to '576' in .*/examples/bluetooth/nimble/blecent/sdkconfig.defaults.esp32h4