--- old/langtools/test/tools/javac/modules/IncubatingTest.java	2017-09-14 22:58:29.000000000 -0700
+++ new/langtools/test/tools/javac/modules/IncubatingTest.java	2017-09-14 22:58:29.000000000 -0700
@@ -189,19 +189,15 @@
         log = new JavacTask(tb)
                 .options("--module-path", classes.toString(),
                          "--add-modules", "jdk.i",
-                         "-XDrawDiagnostics",
-                         "-Werror")
+                         "-XDrawDiagnostics")
                 .outdir(testClasses)
                 .files(findJavaFiles(testSrc))
-                .run(Expect.FAIL)
+                .run(Expect.SUCCESS)
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         expected = Arrays.asList(
-                "- compiler.warn.incubating.modules: jdk.i",
-                "- compiler.err.warnings.and.werror",
-                "1 error",
-                "1 warning"
+                "- compiler.note.incubating.modules: jdk.i"
         );
 
         if (!expected.equals(log)) {
@@ -217,19 +213,15 @@
 
         log = new JavacTask(tb)
                 .options("--module-path", classes.toString(),
-                         "-XDrawDiagnostics",
-                         "-Werror")
+                         "-XDrawDiagnostics")
                 .outdir(testModuleClasses)
                 .files(findJavaFiles(testModuleSrc))
-                .run(Expect.FAIL)
+                .run(Expect.SUCCESS)
                 .writeAll()
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         expected = Arrays.asList(
-                "- compiler.warn.incubating.modules: jdk.i",
-                "- compiler.err.warnings.and.werror",
-                "1 error",
-                "1 warning"
+                "- compiler.note.incubating.modules: jdk.i"
         );
 
         if (!expected.equals(log)) {