diff --git a/examples/wifi/power_save/pytest_wifi_power_save.py b/examples/wifi/power_save/pytest_wifi_power_save.py
index bed25c52016..97d52261617 100644
--- a/examples/wifi/power_save/pytest_wifi_power_save.py
+++ b/examples/wifi/power_save/pytest_wifi_power_save.py
@@ -64,6 +64,19 @@ def test_wifi_power_save_pd_top(dut: Dut) -> None:
     _run_test(dut)
 
 
+@pytest.mark.wifi_ap
+@pytest.mark.parametrize(
+    'config',
+    [
+        'pd_modem',
+    ],
+    indirect=True,
+)
+@idf_parametrize('target', ['esp32c6', 'esp32c5', 'esp32c61'], indirect=['target'])
+def test_wifi_power_save_pd_modem(dut: Dut) -> None:
+    _run_test(dut)
+
+
 @pytest.mark.wifi_ap
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
diff --git a/examples/wifi/power_save/sdkconfig.ci.c2_xtal26m b/examples/wifi/power_save/sdkconfig.ci.c2_xtal26m
index 065020b06fb..68a9d5efcdf 100644
--- a/examples/wifi/power_save/sdkconfig.ci.c2_xtal26m
+++ b/examples/wifi/power_save/sdkconfig.ci.c2_xtal26m
@@ -1,3 +1,4 @@
 CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
diff --git a/examples/wifi/power_save/sdkconfig.ci.c2eco4_xtal26m b/examples/wifi/power_save/sdkconfig.ci.c2eco4_xtal26m
index a302168187a..296928320fd 100644
--- a/examples/wifi/power_save/sdkconfig.ci.c2eco4_xtal26m
+++ b/examples/wifi/power_save/sdkconfig.ci.c2eco4_xtal26m
@@ -2,3 +2,4 @@ CONFIG_IDF_TARGET="esp32c2"
 CONFIG_XTAL_FREQ_26=y
 CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
 CONFIG_ESP32C2_REV_MIN_200=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
diff --git a/examples/wifi/power_save/sdkconfig.ci.c3eco7 b/examples/wifi/power_save/sdkconfig.ci.c3eco7
index 6b253290433..05ef4a47428 100644
--- a/examples/wifi/power_save/sdkconfig.ci.c3eco7
+++ b/examples/wifi/power_save/sdkconfig.ci.c3eco7
@@ -1,3 +1,4 @@
 CONFIG_IDF_TARGET="esp32c3"
 CONFIG_ESP32C3_REV_MIN_101=y
 CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
diff --git a/examples/wifi/power_save/sdkconfig.ci.pd_modem b/examples/wifi/power_save/sdkconfig.ci.pd_modem
new file mode 100644
index 00000000000..604a4ddeb80
--- /dev/null
+++ b/examples/wifi/power_save/sdkconfig.ci.pd_modem
@@ -0,0 +1,4 @@
+CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
+CONFIG_ESP_PHY_MAC_BB_PD=y
+CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP=y
diff --git a/examples/wifi/power_save/sdkconfig.ci.pd_top b/examples/wifi/power_save/sdkconfig.ci.pd_top
index 92f20b28e0f..2bb4010036f 100644
--- a/examples/wifi/power_save/sdkconfig.ci.pd_top
+++ b/examples/wifi/power_save/sdkconfig.ci.pd_top
@@ -1,3 +1,4 @@
 CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
 CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
 CONFIG_ESP_PHY_MAC_BB_PD=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y