--- old/test/java/lang/invoke/modules/ModuleAccessControlTest.java	2016-10-26 11:30:42.000000000 -0700
+++ new/test/java/lang/invoke/modules/ModuleAccessControlTest.java	2016-10-26 11:30:42.000000000 -0700
@@ -26,7 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static jdk.testlibrary.ProcessTools.executeTestJava;
+import jdk.testlibrary.tasks.JavaTask;
 
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -36,7 +36,7 @@
  * @test
  * @library /lib/testlibrary
  * @modules jdk.compiler
- * @build CompilerUtils jdk.testlibrary.*
+ * @build CompilerUtils jdk.testlibrary.tasks.JavaTask
  * @run testng ModuleAccessControlTest
  * @summary Driver for testing module access checking by MethodHandles.Lookup
  */
@@ -68,14 +68,10 @@
      * Launch the test
      */
     @Test
-    public void runTest() throws Exception {
-        int exitValue = executeTestJava("--module-path", MODS_DIR.toString(),
-                                        "-m", "m1/p1.Main")
-                .outputTo(System.out)
-                .errorTo(System.out)
-                .getExitValue();
-
-        assertTrue(exitValue == 0);
+    public void runTest() {
+        new JavaTask().ignoreStandardModuleOptions()
+            .modulePath(MODS_DIR)
+            .module("m1", "p1.Main").run();
     }
 
 }