diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43efbf3e..d8e5bb6f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,16 +35,6 @@ jobs:
         cache: 'gradle'
     - name: print Java version
       run: java -version
-    - name: Set JVM options for JDK 16
-      if: ${{ matrix.java == 16 }}
-      run: echo org.gradle.jvmargs="--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-        --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" >> gradle.properties
     - name: Run build
       run: ./gradlew clean assemble --info
 
@@ -68,16 +58,6 @@ jobs:
           cache: 'gradle'
       - name: print Java version
         run: java -version
-      - name: Set JVM options for JDK 16
-        if: ${{ matrix.java == 16 }}
-        run: echo org.gradle.jvmargs="--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-          --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" >> gradle.properties
       - name: Run test
         run: ./gradlew check --info
 
diff --git a/build.gradle b/build.gradle
index d1699357..04bbe754 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,20 +156,4 @@ subprojects {
     }
 
     sourceCompatibility = 1.8
-
-    if (JavaVersion.current() >= JavaVersion.VERSION_16) {
-        test {
-            jvmArgs = [
-                    "--illegal-access=permit",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-                    "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
-            ]
-        }
-    }
 }