diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3cba95905b..412b2562be 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -139,7 +139,8 @@ repos:
         name: Check if all apps readme files match given .build-test-rules.yml files. Modify the supported target tables
         entry: tools/ci/check_build_test_rules.py check-readmes
         language: python
-        files: 'tools/test_apps/.+|examples/.+|components/.+'
+        files: 'tools/test_apps/.+|examples/.+|components/.+|tools/idf_py_actions/constants.py|tools/ci/check_build_test_rules.py'
+        require_serial: true
         additional_dependencies:
           - PyYAML == 5.3.1
           - idf_build_apps
diff --git a/tools/ci/check_build_test_rules.py b/tools/ci/check_build_test_rules.py
index b25d30c7c5..adf422b251 100755
--- a/tools/ci/check_build_test_rules.py
+++ b/tools/ci/check_build_test_rules.py
@@ -32,6 +32,7 @@ USUAL_TO_FORMAL = {
     'esp32c2': 'ESP32-C2',
     'esp32c6': 'ESP32-C6',
     'esp32h2': 'ESP32-H2',
+    'esp32h4': 'ESP32-H4',
     'linux': 'Linux',
 }
 
@@ -43,6 +44,7 @@ FORMAL_TO_USUAL = {
     'ESP32-C2': 'esp32c2',
     'ESP32-C6': 'esp32c6',
     'ESP32-H2': 'esp32h2',
+    'ESP32-H4': 'esp32h4',
     'Linux': 'linux',
 }
 
@@ -103,7 +105,7 @@ def check_readme(
             for part in support_string[0].split('\n', 1)[0].split('|')
             if part.strip()
         ]
-        return support_string[0].strip(), [FORMAL_TO_USUAL[part] for part in parts[1:]]
+        return support_string[0].strip(), [FORMAL_TO_USUAL[part] for part in parts[1:] if part in FORMAL_TO_USUAL]
 
     def check_enable_build(_app: App, _old_supported_targets: List[str]) -> bool:
         if _app.supported_targets == sorted(_old_supported_targets):
@@ -466,6 +468,9 @@ if __name__ == '__main__':
             else:
                 check_dirs.add(p)
 
+        if 'tools/idf_py_actions/constants.py' in arg.paths or 'tools/ci/check_build_test_rules.py' in arg.paths:
+            check_all = True
+
         if check_all:
             check_dirs = {IDF_PATH}
             _exclude_dirs = [os.path.join(IDF_PATH, 'tools', 'unit-test-app'),