diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 31fc506823..67e715caeb 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -53,6 +53,24 @@
   patterns:
     - host_test
 
+"test:host_test_ldgen":
+  labels:
+    - host_test
+  patterns:
+    - host_test_ldgen
+
+"test:host_test_cli_installer":
+  labels:
+    - host_test
+  patterns:
+    - host_test_cli_installer
+
+"test:host_test_tools":
+  labels:
+    - host_test
+  patterns:
+    - host_test_tools
+
 "test:submodule":
   labels:
     - submodule
diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml
index 78fd2f3b9d..e777d07a9a 100644
--- a/.gitlab/ci/host-test.yml
+++ b/.gitlab/ci/host-test.yml
@@ -73,7 +73,9 @@ test_partition_table_on_host:
     - pytest_for_ut ./gen_esp32part_tests.py
 
 test_ldgen_on_host:
-  extends: .host_test_template
+  extends:
+  - .host_test_template
+  - .rules:test:host_test_ldgen
   script:
     - cd tools/ldgen/test
     - export PYTHONPATH=$PYTHONPATH:..
@@ -104,6 +106,7 @@ test_certificate_bundle_on_host:
 test_cli_installer:
   extends:
     - .host_test_template
+    - .rules:test:host_test_cli_installer
     - .before_script:minimal
   artifacts:
     when: on_failure
@@ -167,6 +170,7 @@ test_sysviewtrace_proc:
 test_tools:
   extends:
     - .host_test_template
+    - .rules:test:host_test_tools
   artifacts:
     paths:
       - ${IDF_PATH}/*.out
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index ea1d3b9ce6..1f83cda4d7 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -9,6 +9,7 @@
 
   - "**/*.{c,C,cpp}"
   - "**/*.{h,H,hpp}"
+  - "Kconfig"
   - "components/**/Kconfig"
   - "components/**/CMakeLists.txt"
 
@@ -44,16 +45,19 @@
 .patterns-build_system: &patterns-build_system
   - "tools/cmake/**/*"
   - "tools/cmakev2/**/*"
-  - "tools/kconfig_new/**/*"
   - "tools/idf.py"
   - "tools/idf_py_actions/**/*"
-  - "tools/requirements.json"
   - "tools/ci/ignore_build_warnings.txt"
   - "tools/ci/test_build_system*.sh"
   - "tools/ci/test_build_system*.py"
   - "tools/ci/build_template_app.sh"
   - "tools/test_build_system/**/*"
 
+.patterns-host_test_ldgen: &patterns-host_test_ldgen
+  - ".gitlab/ci/host-test.yml"
+
+  - "tools/ldgen/**/*"
+
 .patterns-build_system_win: &patterns-build_system_win
   - "tools/test_build_system/**/*"
 
@@ -69,31 +73,11 @@
   - "tools/ci/check_register_rw_half_word.py"
   - "examples/build_system/**/*"
 
-.patterns-host_test: &patterns-host_test
+.patterns-host_test_cli_installer: &patterns-host_test_cli_installer
   - ".gitlab/ci/host-test.yml"
 
-  - "components/**/*"
-
-  - "tools/ci/test_autocomplete/*"
-
-  - "tools/mass_mfg/**/*"
-
-  - "tools/esp_app_trace/**/*"
-  - "tools/ldgen/**/*"
-
-  - "tools/idf_monitor.py"
-
   - "tools/activate.py"
 
-  - "tools/idf.py"
-  - "tools/idf_py_actions/**/*"
-  - "tools/test_idf_py/**/*"
-
-  - "tools/idf_size.py"
-  - "tools/test_idf_size/**/*"
-
-  - "tools/test_idf_diag/**/*"
-
   - "tools/tools.json"
   - "tools/tools_schema.json"
   - "tools/idf_tools.py"
@@ -109,26 +93,49 @@
   - "tools/requirements.json"
   - "tools/requirements_schema.json"
 
+  - "tools/detect_python.sh"
+  - "tools/detect_python.fish"
+
+  - "tools/check_python_dependencies.py"
+
+.patterns-host_test_tools: &patterns-host_test_tools
+  - ".gitlab/ci/host-test.yml"
+
+  - "tools/ci/test_autocomplete/*"
+
+  - "tools/idf_monitor.py"
+
+  - "tools/idf.py"
+  - "tools/idf_py_actions/**/*"
+  - "tools/test_idf_py/**/*"
+
+  - "tools/idf_size.py"
+  - "tools/test_idf_size/**/*"
+
+  - "tools/test_idf_diag/**/*"
+
   - "tools/mkdfu.py"
   - "tools/test_mkdfu/**/*"
 
-  - "tools/kconfig_new/**/*"
+  - "tools/mkuf2.py"
 
-  - "tools/detect_python.sh"
-  - "tools/detect_python.fish"
+  - "tools/bsasm.py"
+  - "tools/test_bsasm/**/*"
+
+.patterns-host_test: &patterns-host_test
+  - ".gitlab/ci/host-test.yml"
+
+  - "components/**/*"
+
+  - "tools/mass_mfg/**/*"
+
+  - "tools/esp_app_trace/**/*"
 
   - "tools/gen_soc_caps_kconfig/*"
   - "tools/gen_soc_caps_kconfig/test/test_gen_soc_caps_kconfig.py"
 
-  - "tools/mkuf2.py"
-
   - "tools/split_paths_by_spaces.py"
 
-  - "tools/check_python_dependencies.py"
-
-  - "tools/bsasm.py"
-  - "tools/test_bsasm/**/*"
-
   - "tools/ci/test_soc_headers_load_in_idf_build_apps.py"
 
 .patterns-docker: &patterns-docker
@@ -380,6 +387,39 @@
     - <<: *if-dev-push
       changes: *patterns-host_test
 
+.rules:test:host_test_cli_installer:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected-check
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-host_test
+    - <<: *if-dev-push
+      changes: *patterns-host_test_cli_installer
+
+.rules:test:host_test_ldgen:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected-check
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-host_test
+    - <<: *if-dev-push
+      changes: *patterns-host_test_ldgen
+
+.rules:test:host_test_tools:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected-check
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-host_test
+    - <<: *if-dev-push
+      changes: *patterns-host_test_tools
+
 .rules:test:submodule:
   rules:
     - <<: *if-revert-branch