diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 91709dcd0..0df8bf0e8 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -349,7 +349,7 @@ tests_arm64_esp32c5:
     - job: build_linux_arm64_test
   variables:
     CHIP_NAME: "esp32c5"
-    TEST_RUN_BOARD_OPTS: "-b esp32c5-builtin -p test_*.*Single"
+    TEST_RUN_BOARD_OPTS: "-b esp32c5-builtin -p test_*.*Single -u /dev/serial_ports/ttyACM-esp32"
 
 tests_armhf_esp32c6:
   extends: .tests_armhf_master_riscv_template
@@ -373,7 +373,7 @@ tests_arm64_esp32c61:
     - job: build_linux_arm64_test
   variables:
     CHIP_NAME: "esp32c61"
-    TEST_RUN_BOARD_OPTS: "-b esp32c61-builtin -p test_*.*Single"
+    TEST_RUN_BOARD_OPTS: "-b esp32c61-builtin -p test_*.*Single -u /dev/serial_ports/ttyACM-esp32"
 
 tests_armhf_esp32h2:
   extends: .tests_armhf_master_riscv_template
@@ -505,7 +505,7 @@ tests_arm64_esp32c5_idf5.4.x:
     - job: build_linux_arm64_test
   variables:
     CHIP_NAME: "esp32c5"
-    TEST_RUN_BOARD_OPTS: "-b esp32c5-builtin -p test_*.*Single"
+    TEST_RUN_BOARD_OPTS: "-b esp32c5-builtin -p test_*.*Single -u /dev/serial_ports/ttyACM-esp32"
 
 tests_armhf_esp32c6_idf5.4.x:
   extends: .tests_armhf_v5.4.x_riscv_template
@@ -529,7 +529,7 @@ tests_arm64_esp32c61_idf5.4.x:
     - job: build_linux_arm64_test
   variables:
     CHIP_NAME: "esp32c61"
-    TEST_RUN_BOARD_OPTS: "-b esp32c61-builtin -p test_*.*Single"
+    TEST_RUN_BOARD_OPTS: "-b esp32c61-builtin -p test_*.*Single -u /dev/serial_ports/ttyACM-esp32"
 
 tests_armhf_esp32h2_idf5.4.x:
   extends: .tests_armhf_v5.4.x_riscv_template
diff --git a/testing/esp/test_special.py b/testing/esp/test_special.py
index a824b3fea..f064928d5 100644
--- a/testing/esp/test_special.py
+++ b/testing/esp/test_special.py
@@ -44,7 +44,6 @@ def _debug_image(self):
         self.run_to_bp_and_check(dbg.TARGET_STOP_REASON_BP, 'vTaskDelay', ['vTaskDelay0'])
         self.clear_bps()
 
-    @skip_for_chip(['esp32s3', 'esp32', 'esp32c5', 'esp32c61'], "skipped - OCD-1011")
     def test_debugging_works_after_hw_reset(self):
         """
             This test checks that debugging works after HW reset.