--- old/test/jdk/modules/scenarios/container/ContainerTest.java	2016-06-22 11:14:21.000000000 -0700
+++ new/test/jdk/modules/scenarios/container/ContainerTest.java	2016-06-22 11:14:21.000000000 -0700
@@ -35,6 +35,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 
 import static jdk.testlibrary.ProcessTools.*;
 
@@ -134,10 +135,8 @@
     public void testContainer() throws Exception {
 
         int exitValue
-            = executeTestJava("-mp", MLIB_DIR.toString(),
-                              "-m", CONTAINER_MODULE)
-                .outputTo(System.out)
-                .errorTo(System.err)
+            = executeModularTest(CONTAINER_MODULE, null, null, null,
+                Arrays.asList(MLIB_DIR), null)
                 .getExitValue();
 
         assertTrue(exitValue == 0);