diff --git a/components/bootloader_support/src/bootloader_clock_init.c b/components/bootloader_support/src/bootloader_clock_init.c
index db1a736d12..dee8bf201b 100644
--- a/components/bootloader_support/src/bootloader_clock_init.c
+++ b/components/bootloader_support/src/bootloader_clock_init.c
@@ -80,4 +80,7 @@ __attribute__((weak)) void bootloader_clock_configure(void)
         rtc_clk_32k_bootstrap(CONFIG_ESP_SYSTEM_RTC_EXT_XTAL_BOOTSTRAP_CYCLES);
     }
 #endif // CONFIG_ESP_SYSTEM_RTC_EXT_XTAL
+
+    REG_WRITE(RTC_CNTL_INT_ENA_REG, 0);
+    REG_WRITE(RTC_CNTL_INT_CLR_REG, UINT32_MAX);
 }
diff --git a/components/esp_hw_support/port/esp32/rtc_init.c b/components/esp_hw_support/port/esp32/rtc_init.c
index 9b2911d42d..f86811a99f 100644
--- a/components/esp_hw_support/port/esp32/rtc_init.c
+++ b/components/esp_hw_support/port/esp32/rtc_init.c
@@ -96,6 +96,9 @@ void rtc_init(rtc_config_t cfg)
         CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_DG_PAD_FORCE_UNHOLD);
         CLEAR_PERI_REG_MASK(RTC_CNTL_DIG_ISO_REG, RTC_CNTL_DG_PAD_FORCE_NOISO);
     }
+
+    REG_WRITE(RTC_CNTL_INT_ENA_REG, 0);
+    REG_WRITE(RTC_CNTL_INT_CLR_REG, UINT32_MAX);
 }
 
 rtc_vddsdio_config_t rtc_vddsdio_get_config(void)
diff --git a/components/esp_hw_support/port/esp32c3/rtc_init.c b/components/esp_hw_support/port/esp32c3/rtc_init.c
index d18f3b1793..19adae8dca 100644
--- a/components/esp_hw_support/port/esp32c3/rtc_init.c
+++ b/components/esp_hw_support/port/esp32c3/rtc_init.c
@@ -147,6 +147,9 @@ void rtc_init(rtc_config_t cfg)
             calibrate_ocode();
         }
     }
+
+    REG_WRITE(RTC_CNTL_INT_ENA_REG, 0);
+    REG_WRITE(RTC_CNTL_INT_CLR_REG, UINT32_MAX);
 }
 
 rtc_vddsdio_config_t rtc_vddsdio_get_config(void)
diff --git a/components/esp_hw_support/port/esp32s2/rtc_init.c b/components/esp_hw_support/port/esp32s2/rtc_init.c
index 85c3b21748..cd212bdeb3 100644
--- a/components/esp_hw_support/port/esp32s2/rtc_init.c
+++ b/components/esp_hw_support/port/esp32s2/rtc_init.c
@@ -159,6 +159,9 @@ void rtc_init(rtc_config_t cfg)
             calibrate_ocode();
         }
     }
+
+    REG_WRITE(RTC_CNTL_INT_ENA_REG, 0);
+    REG_WRITE(RTC_CNTL_INT_CLR_REG, UINT32_MAX);
 }
 
 rtc_vddsdio_config_t rtc_vddsdio_get_config(void)
diff --git a/components/esp_hw_support/port/esp32s3/rtc_init.c b/components/esp_hw_support/port/esp32s3/rtc_init.c
index 09af91eaf4..d2ff24f8bb 100644
--- a/components/esp_hw_support/port/esp32s3/rtc_init.c
+++ b/components/esp_hw_support/port/esp32s3/rtc_init.c
@@ -195,6 +195,9 @@ void rtc_init(rtc_config_t cfg)
         }
         rtc_clk_cpu_freq_set_config(&old_config);
     }
+
+    REG_WRITE(RTC_CNTL_INT_ENA_REG, 0);
+    REG_WRITE(RTC_CNTL_INT_CLR_REG, UINT32_MAX);
 }
 
 rtc_vddsdio_config_t rtc_vddsdio_get_config(void)
diff --git a/components/esp_system/port/brownout.c b/components/esp_system/port/brownout.c
index 91eea5eecc..f65d31de5e 100644
--- a/components/esp_system/port/brownout.c
+++ b/components/esp_system/port/brownout.c
@@ -79,6 +79,7 @@ void esp_brownout_init(void)
 
     brownout_hal_config(&cfg);
 
+
 #ifndef SOC_BROWNOUT_RESET_SUPPORTED
     rtc_isr_register(rtc_brownout_isr_handler, NULL, RTC_CNTL_BROWN_OUT_INT_ENA_M);
 
diff --git a/examples/system/ulp_riscv/example_test.py b/examples/system/ulp_riscv/example_test.py
index 17a3a83286..735fdb7aaa 100644
--- a/examples/system/ulp_riscv/example_test.py
+++ b/examples/system/ulp_riscv/example_test.py
@@ -1,11 +1,14 @@
 from __future__ import unicode_literals
 
 import re
+
+import tiny_test_fw
 import ttfw_idf
+from tiny_test_fw import DUT
 
 
 @ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32s2'])
-def test_examples_ulp_riscv(env, extra_data):
+def test_examples_ulp_riscv(env, extra_data):  # type: (tiny_test_fw.Env.Env, None) -> None # pylint: disable=unused-argument
     dut = env.get_dut('ulp_riscv', 'examples/system/ulp_riscv')
     dut.start_app()
 
@@ -16,17 +19,26 @@ def test_examples_ulp_riscv(env, extra_data):
     # Run two times to make sure device sleep
     # and wake up properly
     for i in range(0, 2):
-        # Pulling GPIO0 low using DTR
-        dut.port_inst.setDTR(True)
+        # Set GPIO0 using DTR
+        dut.port_inst.setDTR(i % 2 == 0)
 
         dut.expect('ULP-RISC-V woke up the main CPU!', timeout=5)
 
-        # We pulled GPIO0 low previously
-        dut.expect(re.compile(r'ULP-RISC-V read changes in GPIO_0 current is: Low'), timeout=5)
+        # Check GPIO state
+        state = 'Low' if i % 2 == 0 else 'High'
+        dut.expect(re.compile(r'ULP-RISC-V read changes in GPIO_0 current is: %s' % state), timeout=5)
 
         # Go back to sleep
         dut.expect('Entering in deep sleep', timeout=5)
 
+        try:
+            # We expect a timeout here, otherwise it means that
+            # the main CPU woke up unexpectedly!
+            dut.expect('ULP-RISC-V woke up the main CPU!', timeout=20)
+            raise Exception('Main CPU woke up unexpectedly!')
+        except DUT.ExpectTimeout:
+            pass
+
 
 if __name__ == '__main__':
     test_examples_ulp_riscv()