--- a/langtools/test/tools/javac/T6725036.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/T6725036.java	Thu Mar 31 15:20:50 2016 -0700
@@ -31,8 +31,7 @@
  *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.compiler/com.sun.tools.javac.util
- *          jdk.jdeps/com.sun.tools.javap
- * @build ToolBox
+ * @build toolbox.ToolBox toolbox.JarTask
  * @run main T6725036
  */
 
@@ -49,6 +48,9 @@
 import com.sun.tools.javac.file.RelativePath.RelativeFile;
 import com.sun.tools.javac.util.Context;
 
+import toolbox.JarTask;
+import toolbox.ToolBox;
+
 public class T6725036 {
     public static void main(String... args) throws Exception {
         new T6725036().run();
@@ -82,7 +84,7 @@
         try (JavaFileManager fm = comp.getStandardFileManager(null, null, null)) {
             File f = new File(name);
             ToolBox tb = new ToolBox();
-            tb.new JarTask(name)
+            new JarTask(tb, name)
                 .files(fm, StandardLocation.PLATFORM_CLASS_PATH, paths)
                 .run();
             return f;