--- old/test/tools/javac/diags/examples/NoJavaLang.java	2021-04-20 14:54:19.609388551 +0200
+++ new/test/tools/javac/diags/examples/NoJavaLang.java	2021-04-20 14:54:19.537386824 +0200
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.misc.fatal.err.no.java.lang
-// options: -Xbootclasspath:
+// options: -Xbootclasspath: -classpath .
 // run: backdoor
 
 class NoJavaLang { }
--- old/test/tools/javac/fatalErrors/NoJavaLangTest.java	2021-04-20 14:54:20.113400624 +0200
+++ new/test/tools/javac/fatalErrors/NoJavaLangTest.java	2021-04-20 14:54:20.037398804 +0200
@@ -58,7 +58,7 @@
         List<String> output = new ArrayList<>();
         ToolBox.JavaToolArgs javacFailArgs =
                 new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
-                .setOptions("-bootclasspath", ".")
+                .setOptions("-bootclasspath", ".", "-classpath", ".")
                 .setSources(noJavaLangSrc)
                 .setErrOutput(output);