diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 513bd8cad8..5be51b4465 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -178,27 +178,6 @@ build:integration_test:
     - "build:example_test"
     - build:target_test
 
-# due to the lack of runners, c2 tests will only be triggered by label
-"test:{0}-esp32c2":
-  matrix:
-    - *target_test
-  labels:
-    - "{0}_esp32c2"
-  included_in:
-    - "build:{0}"
-    - "build:{0}-esp32c2"
-    - build:target_test
-
-# overwrite the esp32c2 component ut again
-"test:component_ut-esp32c2": # component_ut will trigger by unit_test as well, since now we have 2 kinds of UT
-  labels:
-    - "component_ut_esp32c2"
-    - "unit_test_esp32c2"
-  included_in:
-    - build:component_ut
-    - "build:component_ut-esp32c2"
-    - build:target_test
-
 "test:integration_test":
   labels:
     - integration_test
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index c5cc8ffcee..1284848830 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -596,11 +596,14 @@
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32c2
     - <<: *if-label-target_test
+    - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c2
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
       changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-component_ut
     - <<: *if-dev-push
       changes: *patterns-component_ut-adc
     - <<: *if-dev-push
@@ -805,6 +808,8 @@
       changes: *patterns-build_components
     - <<: *if-dev-push
       changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-custom_test
     - <<: *if-dev-push
       changes: *patterns-downloadable-tools
     - <<: *if-dev-push
@@ -999,12 +1004,16 @@
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32c2
     - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-build-example_test
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-downloadable-tools
+    - <<: *if-dev-push
+      changes: *patterns-example_test
     - <<: *if-dev-push
       changes: *patterns-example_test-bt
     - <<: *if-dev-push
@@ -1367,6 +1376,8 @@
       changes: *patterns-target_test-i154
     - <<: *if-dev-push
       changes: *patterns-target_test-wifi
+    - <<: *if-dev-push
+      changes: *patterns-unit_test
     - <<: *if-dev-push
       changes: *patterns-unit_test-sdio
     - <<: *if-dev-push
@@ -1556,8 +1567,13 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32c2
+    - <<: *if-label-target_test
+    - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c2
+    - <<: *if-dev-push
+      changes: *patterns-component_ut
 
 .rules:test:component_ut-esp32c2-adc:
   rules:
@@ -1702,7 +1718,11 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32c2
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-custom_test
 
 .rules:test:custom_test-esp32c3:
   rules:
@@ -1815,7 +1835,13 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32c2
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-build-example_test
+    - <<: *if-dev-push
+      changes: *patterns-example_test
 
 .rules:test:example_test-esp32c3:
   rules:
@@ -1963,7 +1989,11 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-target_test
+    - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c2
+    - <<: *if-dev-push
+      changes: *patterns-unit_test
 
 .rules:test:unit_test-esp32c3:
   rules: