--- a/langtools/test/tools/javap/T6729471.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javap/T6729471.java	Thu Mar 31 15:20:50 2016 -0700
@@ -27,10 +27,9 @@
  * @summary javap does not output inner interfaces of an interface
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
- * @build ToolBox
+ * @build toolbox.ToolBox toolbox.JarTask
  * @run main T6729471
  */
 
@@ -39,6 +38,9 @@
 import java.util.*;
 import javax.tools.*;
 
+import toolbox.JarTask;
+import toolbox.ToolBox;
+
 public class T6729471
 {
     public static void main(String... args) throws IOException {
@@ -82,7 +84,7 @@
         try (JavaFileManager fm = comp.getStandardFileManager(null, null, null)) {
             File f = new File(name);
             ToolBox tb = new ToolBox();
-            tb.new JarTask(f.getPath())
+            new JarTask(tb, f.getPath())
                 .files(fm, StandardLocation.PLATFORM_CLASS_PATH, paths)
                 .run();
             return f;