diff --git a/build.gradle b/build.gradle
index 041431e..c65df58e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2047,6 +2047,12 @@
 def numberOfTestTimesToPrint = 40
 
 test { task ->
+
+    dependsOn buildLibraryDesugarConversions
+    dependsOn getJarsFromSupportLibs
+    // R8.jar is required for running bootstrap tests.
+    dependsOn r8
+
     def newTestingReport = project.hasProperty('testing-report')
     if (newTestingReport) {
         setUpNewTestReporting(task)
@@ -2064,6 +2070,7 @@
         systemProperty 'test_git_HEAD_sha1', project.property('HEAD_sha1')
     }
 
+
     if (!newTestingReport) {
         testLogging.exceptionFormat = 'full'
         if (project.hasProperty('print_test_stdout')) {