diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index aa7ec6a1af..72d43f22dc 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -310,7 +310,7 @@ build_pytest_components_esp32h2:
     IDF_TARGET: esp32h2
     TEST_DIR: components
 
-build_non_test_components_apps:
+build_only_components_apps:
   extends:
     - .build_cmake_template
     - .rules:build:component_ut
@@ -405,6 +405,20 @@ build_pytest_test_apps_esp32h2:
     IDF_TARGET: esp32h2
     TEST_DIR: tools/test_apps
 
+build_only_tools_test_apps:
+  extends:
+    - .build_cmake_template
+    - .rules:build:custom_test
+  parallel: 9
+  script:
+    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
+    - run_cmd python tools/ci/ci_build_apps.py tools/test_apps -v
+      -t all
+      --collect-size-info size_info.txt
+      --collect-app-info list_job_${CI_NODE_INDEX:-1}.json
+      --parallel-count ${CI_NODE_TOTAL:-1}
+      --parallel-index ${CI_NODE_INDEX:-1}
+
 .build_template_app_template:
   extends:
     - .build_template
@@ -660,67 +674,6 @@ build_examples_cmake_esp32h2:
     IDF_TARGET: esp32h2
     TEST_DIR: examples
 
-
-build_test_apps_esp32:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32
-    TEST_DIR: tools/test_apps
-
-build_test_apps_esp32s2:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32s2
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32s2
-    TEST_DIR: tools/test_apps
-
-build_test_apps_esp32s3:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32s3
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32s3
-    TEST_DIR: tools/test_apps
-
-build_test_apps_esp32c3:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32c3
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32c3
-    TEST_DIR: tools/test_apps
-
-build_test_apps_esp32c2:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32c2
-  variables:
-    IDF_TARGET: esp32c2
-    TEST_DIR: tools/test_apps
-
-build_test_apps_esp32c6:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32c6
-  variables:
-    IDF_TARGET: esp32c6
-    TEST_DIR: tools/test_apps
-
-build_test_apps_esp32h2:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test-esp32h2
-  variables:
-    IDF_TARGET: esp32h2
-    TEST_DIR: tools/test_apps
-
 build_clang_test_apps_esp32:
   extends:
     - .build_cmake_clang_template
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index e4021f1efb..29daa05b8e 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -867,6 +867,38 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-wifi
 
+.rules:build:custom_test:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-label-custom_test
+    - <<: *if-label-custom_test_esp32
+    - <<: *if-label-custom_test_esp32c2
+    - <<: *if-label-custom_test_esp32c3
+    - <<: *if-label-custom_test_esp32c6
+    - <<: *if-label-custom_test_esp32h2
+    - <<: *if-label-custom_test_esp32h4
+    - <<: *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
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-custom_test
+    - <<: *if-dev-push
+      changes: *patterns-downloadable-tools
+    - <<: *if-dev-push
+      changes: *patterns-target_test-adc
+    - <<: *if-dev-push
+      changes: *patterns-target_test-i154
+    - <<: *if-dev-push
+      changes: *patterns-target_test-wifi
+
 .rules:build:custom_test-esp32:
   rules:
     - <<: *if-revert-branch