diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b0b1012de..782b90c48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
   build-java-8-plus:
     strategy:
       matrix:
-        java-version: [ 8 , 9 ] #, 10, 11, 12, 13, 14, 15, 16, 17, 18-ea ]
+        java-version: [ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18-ea ]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}
diff --git a/picocli-annotation-processing-tests/build.gradle b/picocli-annotation-processing-tests/build.gradle
index 356ea1e9b..373dd0939 100644
--- a/picocli-annotation-processing-tests/build.gradle
+++ b/picocli-annotation-processing-tests/build.gradle
@@ -9,17 +9,6 @@ version "$projectVersion"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-//if (!JavaVersion.current().isJava11Compatible()) {
-//    sourceCompatibility = 1.8
-//    targetCompatibility = 1.8
-//} else { // from Java 11 and up
-//    tasks.withType(JavaCompile).configureEach {
-//        javaCompiler = javaToolchains.compilerFor {
-//            languageVersion = JavaLanguageVersion.of(JavaVersion.current().majorVersion)
-//        }
-//    }
-//}
-
 dependencies {
     api rootProject
     api project(':picocli-codegen')
diff --git a/picocli-codegen/build.gradle b/picocli-codegen/build.gradle
index f33f2cab7..dd9e6bd54 100644
--- a/picocli-codegen/build.gradle
+++ b/picocli-codegen/build.gradle
@@ -9,17 +9,7 @@ ext.moduleName = 'info.picocli.codegen'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
-//if (!org.gradle.api.JavaVersion.current().isJava11Compatible()) {
-//    sourceCompatibility = 1.6
-//    targetCompatibility = 1.6
-//} else {
-//    // Java 13 cannot compile to target Java 6
-//    tasks.withType(JavaCompile).configureEach {
-//        javaCompiler = javaToolchains.compilerFor {
-//            languageVersion = JavaLanguageVersion.of(JavaVersion.current().majorVersion)
-//        }
-//    }
-//}
+
 dependencies {
     api rootProject
 }