diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 52b712d8..929b1bc4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest, macOS-latest]
-        java: [8, 11, 14, 15]
+        java: [8, 11, 14, 15, 16, 17-ea]
+        jdk: [adopt, zulu]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -44,8 +45,9 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml
index e92f1756..2d9f97cf 100644
--- a/plexus-compiler-its/pom.xml
+++ b/plexus-compiler-its/pom.xml
@@ -49,6 +49,9 @@
                 <goal>clean</goal>
                 <goal>test-compile</goal>
               </goals>
+              <scriptVariables>
+                <errorprone.version>${errorprone.version}</errorprone.version>
+              </scriptVariables>
             </configuration>
           </execution>
         </executions>
diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml
index dbbc85de..d3b0b37b 100644
--- a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml
+++ b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml
@@ -59,7 +59,7 @@
             <path>
               <groupId>com.google.errorprone</groupId>
               <artifactId>error_prone_core</artifactId>
-              <version>2.4.0</version>
+              <version>@errorprone.version@</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
@@ -87,5 +87,46 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk16</id>
+      <activation>
+        <jdk>[16,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>8</source>
+              <target>8</target>
+              <encoding>UTF-8</encoding>
+              <fork>true</fork>
+              <compilerArgs>
+                <arg>-XDcompilePolicy=simple</arg>
+                <arg>-Xplugin:ErrorProne</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+                <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+              </compilerArgs>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>com.google.errorprone</groupId>
+                  <artifactId>error_prone_core</artifactId>
+                  <version>@errorprone.version@</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
index c7bf73b2..0b7c02b1 100644
--- a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
+++ b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_core</artifactId>
-      <version>2.4.0</version>
+      <version>${errorprone.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/pom.xml b/pom.xml
index 2175fd03..3605183c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
     <javaVersion>7</javaVersion>
     <redirectTestOutputToFile>true</redirectTestOutputToFile>
     <project.build.outputTimestamp>2020-08-24T00:30:49Z</project.build.outputTimestamp>
+    <errorprone.version>2.6.0</errorprone.version>
   </properties>
 
   <dependencyManagement>