diff --git a/errorprone-checks/build.gradle b/errorprone-checks/build.gradle
index e1e46a588a..448811ac70 100644
--- a/errorprone-checks/build.gradle
+++ b/errorprone-checks/build.gradle
@@ -19,7 +19,7 @@ dependencies {
   implementation "com.google.errorprone:error_prone_core"
   implementation "com.google.errorprone:error_prone_annotation"
 
-  implementation      "com.google.auto.service:auto-service:1.0-rc4"
+  implementation "com.google.auto.service:auto-service:1.0-rc4"
   annotationProcessor "com.google.auto.service:auto-service:1.0-rc4"
 
   testImplementation "junit:junit"
@@ -30,8 +30,13 @@ dependencies {
 }
 
 test {
-  if (JavaVersion.current().isJava8()) {
-    jvmArgs "-Xbootclasspath/p:${configurations.epJavac.asPath}"
+  if (!JavaVersion.current().isJava8()) {
+    enabled = false
+    logger.info("Disabling {} because errorprone tests always fail in Java {}",
+      project.name, JavaVersion.current().majorVersion)
   }
+
+  jvmArgs "-Xbootclasspath/p:${configurations.epJavac.asPath}"
+
   testLogging { showStandardStreams = true }
 }