--- old/jdk/test/tools/launcher/ToolsOpts.java	2016-08-07 17:46:56.000000000 -0700
+++ new/jdk/test/tools/launcher/ToolsOpts.java	2016-08-07 17:46:55.000000000 -0700
@@ -151,7 +151,7 @@
         init();
         TestResult tr;
         int jpos = -1;
-        String xPatch = "-J-Xpatch:jdk.compiler=jdk.compiler";
+        String xPatch = "-J--patch-module=jdk.compiler=jdk.compiler";
         for (String arg[] : optionPatterns) {
             jpos = indexOfJoption(arg);
             //Build a cmd string for output in results reporting.