diff --git a/test/langtools/tools/javac/options/release/ReleaseOption.java b/test/langtools/tools/javac/options/release/ReleaseOption.java
index d5cfdcd297c2d..369d5cd413f10 100644
--- a/test/langtools/tools/javac/options/release/ReleaseOption.java
+++ b/test/langtools/tools/javac/options/release/ReleaseOption.java
@@ -1,9 +1,10 @@
 /**
  * @test /nodynamiccopyright/
  * @bug 8072480
- * @summary Verify that javac rejects Java 8 program with --release 7
+ * @summary Verify that javac rejects Java 17 program with --release 11
  * @compile ReleaseOption.java
+ * @compile/fail/ref=ReleaseOption.out -XDrawDiagnostics --release 11 ReleaseOption.java
  */
 
-interface ReleaseOption extends java.util.stream.Stream {
+interface ReleaseOption extends java.util.random.RandomGenerator {
 }
diff --git a/test/langtools/tools/javac/options/release/ReleaseOption.out b/test/langtools/tools/javac/options/release/ReleaseOption.out
new file mode 100644
index 0000000000000..be884bf1ed1f2
--- /dev/null
+++ b/test/langtools/tools/javac/options/release/ReleaseOption.out
@@ -0,0 +1,2 @@
+ReleaseOption.java:9:49: compiler.err.doesnt.exist: java.util.random
+1 error
diff --git a/test/langtools/tools/javac/options/release/ReleaseOptionThroughAPI.java b/test/langtools/tools/javac/options/release/ReleaseOptionThroughAPI.java
index 37ae1f343448f..3493dd3cf3147 100644
--- a/test/langtools/tools/javac/options/release/ReleaseOptionThroughAPI.java
+++ b/test/langtools/tools/javac/options/release/ReleaseOptionThroughAPI.java
@@ -50,10 +50,12 @@ void run() throws IOException {
              PrintWriter outWriter = new PrintWriter(out)) {
             Iterable<? extends JavaFileObject> input =
                     fm.getJavaFileObjects(System.getProperty("test.src") + "/ReleaseOption.java");
-            List<String> options = Arrays.asList("--release", "8", "-XDrawDiagnostics", "-Xlint:-options");
+            List<String> options = Arrays.asList("--release", "11", "-XDrawDiagnostics", "-d", ".");
 
             compiler.getTask(outWriter, fm, null, options, null, input).call();
-            String expected ="";
+            String expected =
+                    "ReleaseOption.java:9:49: compiler.err.doesnt.exist: java.util.random" + lineSep +
+                    "1 error" + lineSep;
             if (!expected.equals(out.toString())) {
                 throw new AssertionError("Unexpected output: " + out.toString());
             }