--- old/test/tools/javac/modules/ModuleInfoTest.java	2016-08-05 14:31:59.000000000 -0700
+++ new/test/tools/javac/modules/ModuleInfoTest.java	2016-08-05 14:31:59.000000000 -0700
@@ -188,7 +188,7 @@
         Files.createDirectories(classes);
 
         String log = new JavacTask(tb)
-                .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+                .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -216,7 +216,7 @@
         Files.createDirectories(classes);
 
         String log = new JavacTask(tb)
-                .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+                .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -242,7 +242,7 @@
         Files.createDirectories(classes);
 
         String log = new JavacTask(tb)
-                .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+                .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -289,7 +289,7 @@
         Files.createDirectories(classes);
 
         String log = new JavacTask(tb)
-                .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+                .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -315,7 +315,7 @@
         Files.createDirectories(classes);
 
         String log = new JavacTask(tb)
-                .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+                .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -356,7 +356,7 @@
             tb.writeFile(src_m1.resolve("module-info.java"), moduleInfo);
 
             String log = new JavacTask(tb)
-                    .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
+                    .options("-XDrawDiagnostics", "--module-source-path", src.toString())
                     .outdir(classes)
                     .files(findJavaFiles(src))
                     .run(Task.Expect.FAIL)