diff --git a/.github/workflows/spark_sql_test_3_4.yml b/.github/workflows/spark_sql_test_3_4.yml
index fb196248a8..e894f0a5c1 100644
--- a/.github/workflows/spark_sql_test_3_4.yml
+++ b/.github/workflows/spark_sql_test_3_4.yml
@@ -35,9 +35,14 @@ on:
       - "common/src/main/**"
       - "common/pom.xml"
       - "spark/src/main/**"
+      - "!spark/src/main/spark-3.5/**"
+      - "!spark/src/main/spark-4.0/**"
+      - "!spark/src/main/spark-4.1/**"
+      - "!spark/src/main/spark-4.2/**"
+      - "!spark/src/main/spark-4.x/**"
       - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
       - "spark/pom.xml"
-      - "dev/diffs/**"
+      - "dev/diffs/3.4.3.diff"
       - "pom.xml"
       - "rust-toolchain.toml"
       - ".github/workflows/spark_sql_test_3_4.yml"
diff --git a/.github/workflows/spark_sql_test_3_5.yml b/.github/workflows/spark_sql_test_3_5.yml
index 28225ca5f6..0bf656d81d 100644
--- a/.github/workflows/spark_sql_test_3_5.yml
+++ b/.github/workflows/spark_sql_test_3_5.yml
@@ -35,9 +35,14 @@ on:
       - "common/src/main/**"
       - "common/pom.xml"
       - "spark/src/main/**"
+      - "!spark/src/main/spark-3.4/**"
+      - "!spark/src/main/spark-4.0/**"
+      - "!spark/src/main/spark-4.1/**"
+      - "!spark/src/main/spark-4.2/**"
+      - "!spark/src/main/spark-4.x/**"
       - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
       - "spark/pom.xml"
-      - "dev/diffs/**"
+      - "dev/diffs/3.5.8.diff"
       - "pom.xml"
       - "rust-toolchain.toml"
       - ".github/workflows/spark_sql_test_3_5.yml"
@@ -54,9 +59,14 @@ on:
       - "common/src/main/**"
       - "common/pom.xml"
       - "spark/src/main/**"
+      - "!spark/src/main/spark-3.4/**"
+      - "!spark/src/main/spark-4.0/**"
+      - "!spark/src/main/spark-4.1/**"
+      - "!spark/src/main/spark-4.2/**"
+      - "!spark/src/main/spark-4.x/**"
       - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
       - "spark/pom.xml"
-      - "dev/diffs/**"
+      - "dev/diffs/3.5.8.diff"
       - "pom.xml"
       - "rust-toolchain.toml"
       - ".github/workflows/spark_sql_test_3_5.yml"
diff --git a/.github/workflows/spark_sql_test_4_0.yml b/.github/workflows/spark_sql_test_4_0.yml
index 9df8593169..d9d090ac47 100644
--- a/.github/workflows/spark_sql_test_4_0.yml
+++ b/.github/workflows/spark_sql_test_4_0.yml
@@ -35,9 +35,14 @@ on:
       - "common/src/main/**"
       - "common/pom.xml"
       - "spark/src/main/**"
+      - "!spark/src/main/spark-3.4/**"
+      - "!spark/src/main/spark-3.5/**"
+      - "!spark/src/main/spark-3.x/**"
+      - "!spark/src/main/spark-4.1/**"
+      - "!spark/src/main/spark-4.2/**"
       - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
       - "spark/pom.xml"
-      - "dev/diffs/**"
+      - "dev/diffs/4.0.2.diff"
       - "pom.xml"
       - "rust-toolchain.toml"
       - ".github/workflows/spark_sql_test_4_0.yml"
@@ -54,9 +59,14 @@ on:
       - "common/src/main/**"
       - "common/pom.xml"
       - "spark/src/main/**"
+      - "!spark/src/main/spark-3.4/**"
+      - "!spark/src/main/spark-3.5/**"
+      - "!spark/src/main/spark-3.x/**"
+      - "!spark/src/main/spark-4.1/**"
+      - "!spark/src/main/spark-4.2/**"
       - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
       - "spark/pom.xml"
-      - "dev/diffs/**"
+      - "dev/diffs/4.0.2.diff"
       - "pom.xml"
       - "rust-toolchain.toml"
       - ".github/workflows/spark_sql_test_4_0.yml"
diff --git a/.github/workflows/spark_sql_test_4_1.yml b/.github/workflows/spark_sql_test_4_1.yml
index 3cbdc34469..33a6e8438c 100644
--- a/.github/workflows/spark_sql_test_4_1.yml
+++ b/.github/workflows/spark_sql_test_4_1.yml
@@ -35,9 +35,14 @@ on:
       - "common/src/main/**"
       - "common/pom.xml"
       - "spark/src/main/**"
+      - "!spark/src/main/spark-3.4/**"
+      - "!spark/src/main/spark-3.5/**"
+      - "!spark/src/main/spark-3.x/**"
+      - "!spark/src/main/spark-4.0/**"
+      - "!spark/src/main/spark-4.2/**"
       - "!spark/src/main/scala/org/apache/comet/GenerateDocs.scala"
       - "spark/pom.xml"
-      - "dev/diffs/**"
+      - "dev/diffs/4.1.1.diff"
       - "pom.xml"
       - "rust-toolchain.toml"
       - ".github/workflows/spark_sql_test_4_1.yml"