--- a/langtools/test/tools/javac/modules/HelloWorldTest.java	Wed Aug 10 13:52:02 2016 -0700
+++ b/langtools/test/tools/javac/modules/HelloWorldTest.java	Wed Aug 10 15:47:46 2016 -0700
@@ -76,7 +76,7 @@
         new JavacTask(tb)
             .options("-source", "8",
                 "-target", "8",
-                "-bootclasspath", smallRtJar.toString())
+                "--boot-class-path", smallRtJar.toString())
             .outdir(classes)
             .files(src.resolve("HelloWorld.java"))
             .run();
@@ -131,7 +131,7 @@
         Files.createDirectories(classes);
 
         new JavacTask(tb)
-            .options("-modulesourcepath", src.toString())
+            .options("--module-source-path", src.toString())
             .outdir(classes)
             .files(src_m1.resolve("p/HelloWorld.java"))
             .run()