--- old/langtools/test/tools/lib/toolbox/JavaTask.java	2016-08-07 17:48:12.000000000 -0700
+++ new/langtools/test/tools/lib/toolbox/JavaTask.java	2016-08-07 17:48:12.000000000 -0700
@@ -67,6 +67,16 @@
     }
 
     /**
+     * Sets the VM options.
+     * @param vmOptions the options
+     * @return this task object
+     */
+    public JavaTask vmOptions(List<String> vmOptions) {
+        this.vmOptions = vmOptions;
+        return this;
+    }
+
+    /**
      * Sets the name of the class to be executed.
      * @param className the name of the class
      * @return this task object
@@ -87,6 +97,16 @@
     }
 
     /**
+     * Sets the arguments for the class to be executed.
+     * @param classArgs the arguments
+     * @return this task object
+     */
+    public JavaTask classArgs(List<String> classArgs) {
+        this.classArgs = classArgs;
+        return this;
+    }
+
+    /**
      * Sets whether or not the standard VM and java options for the test should be passed
      * to the new VM instance. If this method is not called, the default behavior is that
      * the options will be passed to the new VM instance.