diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index b6d8baaabf..8c2bb7675d 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -63,6 +63,7 @@
     - build_system
   included_in:
     - "build:{0}"
+    - build:target_test
 
 build:integration_test:
   labels:
@@ -70,6 +71,8 @@ build:integration_test:
   patterns:
     - build_components
     - build_system
+  included_in:
+    - build:target_test
 
 ####################
 # Target Test Jobs #
@@ -81,6 +84,7 @@ build:integration_test:
   labels: # For each rule, use labels <test_type> and <test_type>-<target>
     - "{0}"
     - "{0}_{1}"
+    - target_test
   patterns: # For each rule, use patterns <test_type> and build-<test_type>
     - "{0}"
     - "build-{0}"
@@ -88,7 +92,6 @@ build:integration_test:
     - "build:{0}"
     - "build:{0}-{1}"
     - build:target_test
-    - test:target_test
 
 # -------------
 # Special Cases
@@ -101,6 +104,7 @@ build:integration_test:
     - "component_ut_{0}"
     - unit_test
     - "unit_test_{0}"
+    - target_test
   patterns:
     - component_ut
     - "build-component_ut-{0}"
@@ -108,17 +112,16 @@ build:integration_test:
     - build:component_ut
     - "build:component_ut-{0}"
     - build:target_test
-    - test:target_test
 
 "test:integration_test":
   labels:
     - integration_test
+    - target_test
   patterns:
     - integration_test
   included_in:
     - build:integration_test
     - build:target_test
-    - test:target_test
 
 "test:host_test":
   labels:
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 75a101a35a..fecf3c51e7 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -336,6 +336,9 @@
 .if-label-submodule: &if-label-submodule
   if: '$BOT_LABEL_SUBMODULE || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*submodule(?:,[^,\n\r]+)*$/i'
 
+.if-label-target_test: &if-label-target_test
+  if: '$BOT_LABEL_TARGET_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*target_test(?:,[^,\n\r]+)*$/i'
+
 .if-label-unit_test: &if-label-unit_test
   if: '$BOT_LABEL_UNIT_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test(?:,[^,\n\r]+)*$/i'
 
@@ -375,6 +378,7 @@
     - <<: *if-label-component_ut_esp32c3
     - <<: *if-label-component_ut_esp32s2
     - <<: *if-label-component_ut_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-label-unit_test_esp32c3
@@ -393,6 +397,7 @@
     - <<: *if-label-build
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-dev-push
@@ -408,6 +413,7 @@
     - <<: *if-label-build
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32c3
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-dev-push
@@ -423,6 +429,7 @@
     - <<: *if-label-build
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32s2
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-dev-push
@@ -438,6 +445,7 @@
     - <<: *if-label-build
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-dev-push
@@ -456,6 +464,7 @@
     - <<: *if-label-custom_test_esp32c3
     - <<: *if-label-custom_test_esp32s2
     - <<: *if-label-custom_test_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-label-weekend_test
     - <<: *if-dev-push
       changes: *patterns-build_components
@@ -470,6 +479,7 @@
     - <<: *if-label-build
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32
+    - <<: *if-label-target_test
     - <<: *if-label-weekend_test
     - <<: *if-dev-push
       changes: *patterns-build_components
@@ -484,6 +494,7 @@
     - <<: *if-label-build
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32c3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
@@ -497,6 +508,7 @@
     - <<: *if-label-build
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32s2
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
@@ -510,6 +522,7 @@
     - <<: *if-label-build
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
@@ -535,6 +548,7 @@
     - <<: *if-label-example_test_esp32s2
     - <<: *if-label-example_test_esp32s3
     - <<: *if-label-iperf_stress_test
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -551,6 +565,7 @@
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32
     - <<: *if-label-iperf_stress_test
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -566,6 +581,7 @@
     - <<: *if-label-build
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32c3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -581,6 +597,7 @@
     - <<: *if-label-build
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32s2
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -596,6 +613,7 @@
     - <<: *if-label-build
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -610,6 +628,7 @@
     - <<: *if-protected
     - <<: *if-label-build
     - <<: *if-label-integration_test
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build_components
     - <<: *if-dev-push
@@ -647,6 +666,7 @@
     - <<: *if-label-example_test_esp32s3
     - <<: *if-label-integration_test
     - <<: *if-label-iperf_stress_test
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-label-unit_test_esp32c3
@@ -674,6 +694,7 @@
   rules:
     - <<: *if-protected
     - <<: *if-label-build
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-label-unit_test_esp32c3
@@ -690,6 +711,7 @@
   rules:
     - <<: *if-protected
     - <<: *if-label-build
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-dev-push
@@ -703,6 +725,7 @@
   rules:
     - <<: *if-protected
     - <<: *if-label-build
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-dev-push
@@ -716,6 +739,7 @@
   rules:
     - <<: *if-protected
     - <<: *if-label-build
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-dev-push
@@ -729,6 +753,7 @@
   rules:
     - <<: *if-protected
     - <<: *if-label-build
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-dev-push
@@ -772,6 +797,7 @@
       when: never
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-dev-push
@@ -784,6 +810,7 @@
       when: never
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32c3
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-dev-push
@@ -796,6 +823,7 @@
       when: never
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32s2
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-dev-push
@@ -808,6 +836,7 @@
       when: never
     - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-dev-push
@@ -820,6 +849,7 @@
       when: never
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-custom_test
 
@@ -830,6 +860,7 @@
       when: never
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32c3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-custom_test
 
@@ -840,6 +871,7 @@
       when: never
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32s2
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-custom_test
 
@@ -850,6 +882,7 @@
       when: never
     - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-custom_test
 
@@ -860,6 +893,7 @@
       when: never
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -872,6 +906,7 @@
       when: never
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32c3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -884,6 +919,7 @@
       when: never
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32s2
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -896,6 +932,7 @@
       when: never
     - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32s3
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-build-example_test
     - <<: *if-dev-push
@@ -916,6 +953,7 @@
     - <<: *if-label-build-only
       when: never
     - <<: *if-label-integration_test
+    - <<: *if-label-target_test
     - <<: *if-dev-push
       changes: *patterns-integration_test
 
@@ -928,50 +966,12 @@
     - <<: *if-dev-push
       changes: *patterns-submodule
 
-.rules:test:target_test:
-  rules:
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-component_ut
-    - <<: *if-label-component_ut_esp32
-    - <<: *if-label-component_ut_esp32c3
-    - <<: *if-label-component_ut_esp32s2
-    - <<: *if-label-component_ut_esp32s3
-    - <<: *if-label-custom_test
-    - <<: *if-label-custom_test_esp32
-    - <<: *if-label-custom_test_esp32c3
-    - <<: *if-label-custom_test_esp32s2
-    - <<: *if-label-custom_test_esp32s3
-    - <<: *if-label-example_test
-    - <<: *if-label-example_test_esp32
-    - <<: *if-label-example_test_esp32c3
-    - <<: *if-label-example_test_esp32s2
-    - <<: *if-label-example_test_esp32s3
-    - <<: *if-label-integration_test
-    - <<: *if-label-unit_test
-    - <<: *if-label-unit_test_esp32
-    - <<: *if-label-unit_test_esp32c3
-    - <<: *if-label-unit_test_esp32s2
-    - <<: *if-label-unit_test_esp32s3
-    - <<: *if-dev-push
-      changes: *patterns-build-example_test
-    - <<: *if-dev-push
-      changes: *patterns-component_ut
-    - <<: *if-dev-push
-      changes: *patterns-custom_test
-    - <<: *if-dev-push
-      changes: *patterns-example_test
-    - <<: *if-dev-push
-      changes: *patterns-integration_test
-    - <<: *if-dev-push
-      changes: *patterns-unit_test
-
 .rules:test:unit_test-esp32:
   rules:
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32
     - <<: *if-dev-push
@@ -982,6 +982,7 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32c3
     - <<: *if-dev-push
@@ -992,6 +993,7 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s2
     - <<: *if-dev-push
@@ -1002,6 +1004,7 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-target_test
     - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-dev-push