--- old/test/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java	2016-06-22 11:14:25.000000000 -0700
+++ new/test/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java	2016-06-22 11:14:25.000000000 -0700
@@ -33,8 +33,9 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 
-import static jdk.testlibrary.ProcessTools.executeTestJava;
+import static jdk.testlibrary.ProcessTools.executeModularTest;
 
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -91,12 +92,9 @@
         String mid = "test/jdk.test.Main";
 
         int exitValue
-            = executeTestJava(
-                "-upgrademodulepath", UPGRADEDMODS_DIR.toString(),
-                "-mp", MODS_DIR.toString(),
-                "-m", mid)
-            .outputTo(System.out)
-            .errorTo(System.out)
+            = executeModularTest(mid, null,
+                Arrays.asList( "-upgrademodulepath", UPGRADEDMODS_DIR.toString()),
+                null, Arrays.asList(MODS_DIR), null)
             .getExitValue();
 
         assertTrue(exitValue == 0);
@@ -115,12 +113,9 @@
         String mid = "test/jdk.test.Main";
 
         int exitValue
-            = executeTestJava(
-                "-upgrademodulepath", upgrademodulepath,
-                "-mp", MODS_DIR.toString(),
-                "-m", mid)
-            .outputTo(System.out)
-            .errorTo(System.out)
+            = executeModularTest(mid, null,
+                Arrays.asList("-upgrademodulepath", upgrademodulepath),
+                null, Arrays.asList(MODS_DIR), null)
             .getExitValue();
 
         assertTrue(exitValue == 0);