diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f043fa460..665308dfda 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,7 +140,7 @@ jobs:
     environment:
     - JAVA11_HOME: /usr/lib/jvm/jdk-11
     - TEST_TASK: testJava11 latestDepTestJava11
-    - INSTALL_OPENJDK: https://download.java.net/java/early_access/jdk11/28/GPL/openjdk-11+28_linux-x64_bin.tar.gz
+    - INSTALL_OPENJDK: https://download.java.net/java/ga/jdk11/openjdk-11_linux-x64_bin.tar.gz
 
   agent_integration_tests:
     <<: *defaults
diff --git a/gradle/java.gradle b/gradle/java.gradle
index ea96f2b31f..0840b6049e 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -147,16 +147,22 @@ tasks.withType(Test) {
 
   def cloned = it
 
-  [7,9,10,11]. each { i ->
+  [7, 9, 10, 11].each { i ->
     def javaHome = System.getenv("JAVA${i}_HOME")
     if (javaHome != null) {
       def test = task "${cloned.name}Java${i}"(type: cloned.class) {
         group = "Verification"
         description "Runs $cloned.name under Java ${i}"
         executable = "$javaHome/bin/java"
-        afterEvaluate {
-          exclude project.testJava8Only
-          exclude project.testJava8Minimum
+        if (i == 7) {
+          afterEvaluate {
+            exclude project.testJava8Only
+            exclude project.testJava8Minimum
+          }
+        } else if (i > 8) {
+          afterEvaluate {
+            exclude project.testJava8Only
+          }
         }
       }
       tasks.check.dependsOn test