diff --git a/.github/workflows/ci_metrics.yml b/.github/workflows/ci_metrics.yml
index fa6aa86fb..93416f75d 100644
--- a/.github/workflows/ci_metrics.yml
+++ b/.github/workflows/ci_metrics.yml
@@ -4,7 +4,6 @@ on:
   workflow_run:
     workflows:
       - "end-to-end"
-      - "Linting"
       - "Tests"
     types:
       - completed
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index db9611879..765cc2753 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -482,6 +482,8 @@ jobs:
     # This way we'll be able to mark only this test as required
     # and skip it accordingly.
     needs:
+      - check-imports
+      - lint
       - integration-tests-linux
       - integration-tests-macos
       - integration-tests-windows
diff --git a/.github/workflows/tests_skipper_trigger.yml b/.github/workflows/tests_skipper_trigger.yml
index ee1b0fa14..8fe3706bc 100644
--- a/.github/workflows/tests_skipper_trigger.yml
+++ b/.github/workflows/tests_skipper_trigger.yml
@@ -11,7 +11,7 @@ on:
     paths-ignore:
       # we skip the tests unless the code changes. The problem is that GitHub will run the check anyway if any other
       # file outside the code changed (e.g. the release notes). Hence, we need a second filter down below.
-      # keep the list in sync with the paths defined in the `tests.yml` workflow
+      # keep the list in sync with the paths defined in the `tests.yml` workflow and below in this file
       - "haystack/**/*.py"
       - "haystack/core/pipeline/predefined/*"
       - "test/**/*.py"
@@ -32,13 +32,14 @@ jobs:
         id: changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         with:
-          # keep the list in sync with the paths defined in the `tests.yml` workflow
+          # keep the list in sync with the paths defined in the `tests.yml` workflow and above in this file
           filters: |
             code_changes:
-              - haystack/**/*.py
-              - "haystack/templates/predefined/*"
-              - test/**/*.py
+              - "haystack/**/*.py"
+              - "haystack/core/pipeline/predefined/*"
+              - "test/**/*.py"
               - "pyproject.toml"
+              - ".github/utils/check_imports.py"
 
   trigger-catch-all:
     name: Tests completed