diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d32641ebb..3bb5a022b 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '8', '11', '17', '21' ]
         os: [ ubuntu-20.04 ]
 
     steps:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index f61f742da..4d78c4359 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '8', '11', '17', '21' ]
         os: [ macos-10.15 ]
 
     steps:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 90723fae1..bdde66a92 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '8', '11', '17', '21' ]
         os: [ windows-2019 ]
 
     steps:
diff --git a/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java b/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java
index 849a1eb4e..a5584793a 100644
--- a/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/Compile.java
@@ -71,7 +71,7 @@ private Compile(String html, String code, String sl) throws IOException {
     /** Performs compilation of given HTML page and associated Java code
      */
     public static Compile create(String html, String code) throws IOException {
-        return create(html, code, "1.7");
+        return create(html, code, "8");
     }
     static Compile create(String html, String code, String sourceLevel) throws IOException {
         return new Compile(html, code, sourceLevel);
@@ -210,7 +210,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
             }
         };
 
-        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", sourceLevel), null, Arrays.asList(file)).call();
 
         Map<String, byte[]> result = new HashMap<>();
 
diff --git a/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java b/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java
index b2d19f410..6f207a5c3 100644
--- a/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java
+++ b/geo/src/test/java/org/netbeans/html/geo/impl/Compile.java
@@ -70,7 +70,7 @@ private Compile(String html, String code, String sl) throws IOException {
     /** Performs compilation of given HTML page and associated Java code
      */
     public static Compile create(String html, String code) throws IOException {
-        return create(html, code, "1.7");
+        return create(html, code, "8");
     }
     static Compile create(String html, String code, String sourceLevel) throws IOException {
         return new Compile(html, code, sourceLevel);
@@ -202,7 +202,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
             }
         };
 
-        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", sourceLevel), null, Arrays.asList(file)).call();
 
         Map<String, byte[]> result = new HashMap<String, byte[]>();
 
diff --git a/json/src/test/java/net/java/html/json/Compile.java b/json/src/test/java/net/java/html/json/Compile.java
index c759e8e27..7ca2c4d6f 100644
--- a/json/src/test/java/net/java/html/json/Compile.java
+++ b/json/src/test/java/net/java/html/json/Compile.java
@@ -70,7 +70,7 @@ private Compile(String html, String code, String sl) throws IOException {
     /** Performs compilation of given HTML page and associated Java code
      */
     public static Compile create(String html, String code) throws IOException {
-        return create(html, code, "1.7");
+        return create(html, code, "8");
     }
     static Compile create(String html, String code, String sourceLevel) throws IOException {
         return new Compile(html, code, sourceLevel);
@@ -225,7 +225,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept
             }
         };
 
-        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", "1.7"), null, Arrays.asList(file)).call();
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", sourceLevel, "-target", sourceLevel), null, Arrays.asList(file)).call();
 
         Map<String, byte[]> result = new HashMap<String, byte[]>();