diff --git a/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt b/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
index 042940e..79835af 100644
--- a/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
+++ b/cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt
@@ -3,7 +3,6 @@ package com.bazel_diff.e2e
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import com.bazel_diff.cli.BazelDiff
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
@@ -188,8 +187,6 @@ class E2ETest {
         testFineGrainedHashBzlMod(listOf("--useCquery"), "@rules_jvm_external~~maven~maven", "/fixture/fine-grained-hash-bzlmod-cquery-test-impacted-targets.txt")
     }
 
-    // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
-    @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
     @Test
     fun testUseCqueryWithExternalDependencyChange() {
         // The difference between these two snapshots is simply upgrading the Guava version for Android platform.
@@ -292,8 +289,6 @@ class E2ETest {
         assertThat(actual).isEqualTo(expected)
     }
 
-    // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
-    @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
     @Test
     fun testUseCqueryWithAndroidCodeChange() {
         // The difference between these two snapshots is simply making a code change to Android-only source code.
diff --git a/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt b/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt
index a65892a..a4a1295 100644
--- a/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt
+++ b/cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt
@@ -1,2 +1,3 @@
-//src/main/java/com/integration:android
-//src/main/java/com/integration:guava-user
\ No newline at end of file
+@@//src/main/java/com/integration:android
+@@//src/main/java/com/integration:android_deployjars_internal_rule
+@@//src/main/java/com/integration:guava-user
diff --git a/cli/src/test/resources/fixture/cquery-test-android-code-change.zip b/cli/src/test/resources/fixture/cquery-test-android-code-change.zip
index 4d142d7..2aee278 100644
Binary files a/cli/src/test/resources/fixture/cquery-test-android-code-change.zip and b/cli/src/test/resources/fixture/cquery-test-android-code-change.zip differ
diff --git a/cli/src/test/resources/fixture/cquery-test-base.zip b/cli/src/test/resources/fixture/cquery-test-base.zip
index 9f1a8f9..6a611d7 100644
Binary files a/cli/src/test/resources/fixture/cquery-test-base.zip and b/cli/src/test/resources/fixture/cquery-test-base.zip differ
diff --git a/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt b/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt
index 905b125..68d328f 100644
--- a/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt
+++ b/cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt
@@ -1,7 +1,8 @@
 //external:bazel_diff_maven_android
-//src/main/java/com/integration:android
-//src/main/java/com/integration:guava-user
-@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
-@bazel_diff_maven_android//:com_google_guava_guava
-@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
-@bazel_diff_maven_android//:org_checkerframework_checker_qual
\ No newline at end of file
+@@//src/main/java/com/integration:android
+@@//src/main/java/com/integration:android_deployjars_internal_rule
+@@//src/main/java/com/integration:guava-user
+@@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
+@@bazel_diff_maven_android//:com_google_guava_guava
+@@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
+@@bazel_diff_maven_android//:org_checkerframework_checker_qual
diff --git a/cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip b/cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip
index 4fee280..5dbe436 100644
Binary files a/cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip and b/cli/src/test/resources/fixture/cquery-test-guava-upgrade.zip differ