diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b82e4c19..33aeb267 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,14 +27,14 @@ jobs:
     uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
     with:
       jdk-fast-fail-build: '11'
-      jdk-matrix: '["11", "17"]'
+      jdk-matrix: '["11", "17", "20"]'
       jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica","corretto"]'
       os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]'
-#      matrix-exclude: '[
-#          { "jdk": "21-ea", "distribution": "corretto"  },
-#          { "jdk": "21-ea", "distribution": "liberica"  },
-#          { "jdk": "21-ea", "distribution": "microsoft" },
-#          { "jdk": "21-ea", "distribution": "temurin"   }
-#         ]'
+      matrix-exclude: '[
+          { "jdk": "21-ea", "distribution": "corretto"  },
+          { "jdk": "21-ea", "distribution": "liberica"  },
+          { "jdk": "20", "distribution": "microsoft" },
+          { "jdk": "21-ea", "distribution": "temurin"   }
+         ]'
       maven_args: 'install javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'
 
diff --git a/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy b/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy
index d1c4410d..02a72b64 100644
--- a/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy
+++ b/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy
@@ -20,6 +20,8 @@ def logFile = new File( basedir, 'build.log' )
 assert logFile.exists()
 content = logFile.text.normalize()
 
+assert content.contains( "Tests run: 2, Failures: 0, Errors: 0, Skipped: 0" )
+
 def junitLog = """Running org.acme.ApplicationTest
 call(String org.acme.Application.greet(String))
 execution(String org.acme.Application.greet(String))
@@ -28,7 +30,6 @@ call(void org.acme.Application.main(String[]))
 execution(void org.acme.Application.main(String[]))
 Running application
 execution(String org.acme.Application.greet(String))
-call(void org.junit.Assert.assertTrue(boolean))
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0""".normalize()
+call(void org.junit.Assert.assertTrue(boolean))""".normalize()
 
 assert content.contains( junitLog )
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
index 18c61b63..8cf53bbb 100644
--- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
@@ -69,7 +69,7 @@ protected int expectedErrors()
         String javaVersion = getJavaVersion();
         if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
             javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
-            javaVersion.contains("18")||javaVersion.contains("19")){
+            javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")){
             return 5;
         }
         // javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence, not one.
@@ -89,7 +89,7 @@ protected int expectedWarnings()
         String javaVersion = getJavaVersion();
         if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
             javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
-            javaVersion.contains("18")||javaVersion.contains("19")){
+            javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")){
             return 1;
         }
         if (javaVersion.contains("1.8")){
@@ -134,6 +134,9 @@ public String getTargetVersion()
         if (javaVersion.contains("19")){
             return "19";
         }
+        if (javaVersion.contains("20")){
+            return "20";
+        }
         return super.getTargetVersion();
     }
 
@@ -169,6 +172,9 @@ public String getSourceVersion()
         if (javaVersion.contains("19")){
             return "19";
         }
+        if (javaVersion.contains("20")){
+            return "20";
+        }
         return super.getTargetVersion();
     }
 
@@ -178,7 +184,7 @@ protected Collection<String> expectedOutputFiles()
         String javaVersion = getJavaVersion();
         if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||
             javaVersion.contains("15")||javaVersion.contains("16")||javaVersion.contains("17")||
-            javaVersion.contains("18")||javaVersion.contains("19")
+            javaVersion.contains("18")||javaVersion.contains("19")||javaVersion.contains("20")
         ){
             return Arrays.asList( "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class",
                     "org/codehaus/foo/Person.class" );