diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index eaf1d76124..9fb2e77950 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -77,6 +77,11 @@ test_weekend_network:
     - .example_test_template
     - .rules:test:example_test-esp32
 
+.example_test_esp32s2_template:
+  extends:
+    - .example_test_template
+    - .rules:test:example_test-esp32s2
+
 example_test_001A:
   extends: .example_test_esp32_template
   parallel: 4
@@ -229,6 +234,12 @@ example_test_016:
       - $CI_PROJECT_DIR/examples/*/*/*.log
       - $LOG_PATH
 
+example_test_017:
+  extends: .example_test_esp32s2_template
+  tags:
+    - ESP32S2
+    - Example_GENERIC
+
 .test_app_template:
   extends: .target_test_job_template
   variables:
diff --git a/examples/system/ulp_riscv/example_test.py b/examples/system/ulp_riscv/example_test.py
new file mode 100644
index 0000000000..17a3a83286
--- /dev/null
+++ b/examples/system/ulp_riscv/example_test.py
@@ -0,0 +1,32 @@
+from __future__ import unicode_literals
+
+import re
+import ttfw_idf
+
+
+@ttfw_idf.idf_example_test(env_tag='Example_GENERIC', target=['esp32s2'])
+def test_examples_ulp_riscv(env, extra_data):
+    dut = env.get_dut('ulp_riscv', 'examples/system/ulp_riscv')
+    dut.start_app()
+
+    dut.expect_all('Not a ULP-RISC-V wakeup, initializing it!',
+                   'Entering in deep sleep',
+                   timeout=30)
+
+    # 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)
+
+        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)
+
+        # Go back to sleep
+        dut.expect('Entering in deep sleep', timeout=5)
+
+
+if __name__ == '__main__':
+    test_examples_ulp_riscv()