diff --git a/tools/utils.py b/tools/utils.py
index cad17b7..2fd1140 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -51,8 +51,8 @@
 GRADLE_TASK_SOURCE_JAR = ':test:packageSources'
 GRADLE_TASK_SWISS_ARMY_KNIFE = ':main:swissArmyKnife'
 GRADLE_TASK_TEST = ':test:test'
-GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR = ':test:allTestsWithApplyMapping'
-GRADLE_TASK_TEST_DEPS_JAR = ':test:allDepsJar'
+GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR = ':test:rewriteTestsForR8LibWithRelocatedDeps'
+GRADLE_TASK_TEST_DEPS_JAR = ':test:packageTestDeps'
 GRADLE_TASK_TEST_JAR = ':test:allTestsJar'
 
 R8 = 'r8'