--- old/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java	2014-02-07 06:28:25.673156500 -0500
+++ new/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java	2014-02-07 06:28:25.463144600 -0500
@@ -142,11 +142,23 @@
    * with any platform specific arguments prepended
    */
   public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
+    return createJavaProcessBuilder(false, command);
+  }
+  
+  public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmOptions, String... command) throws Exception {
     String javapath = JDKToolFinder.getJDKTool("java");
 
     ArrayList<String> args = new ArrayList<>();
     args.add(javapath);
     Collections.addAll(args, getPlatformSpecificVMArgs());
+    
+    if (addTestVmOptions) {
+      String vmopts = System.getProperty("test.vm.opts");
+      if (vmopts != null) {
+        Collections.addAll(args, vmopts.split("\\s"));
+      }
+    }
+    
     Collections.addAll(args, command);
 
     // Reporting
@@ -157,5 +169,4 @@
 
     return new ProcessBuilder(args.toArray(new String[args.size()]));
   }
-
 }