--- a/langtools/test/tools/javap/4866831/PublicInterfaceTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javap/4866831/PublicInterfaceTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -27,16 +27,19 @@
  * @summary Verify that javap marks public interfaces as public
  * @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.JavapTask
  * @run main PublicInterfaceTest
  */
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import toolbox.JavapTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
 // Original test: test/tools/javap/PublicInterfaceTest.sh
 public class PublicInterfaceTest {
     public interface Test {}
@@ -46,10 +49,10 @@
 
         Path pathToClass = Paths.get(ToolBox.testClasses, "PublicInterfaceTest$Test.class");
 
-        String out = tb.new JavapTask()
+        String out = new JavapTask(tb)
                 .classes(pathToClass.toString())
                 .run()
-                .getOutput(ToolBox.OutputKind.DIRECT);
+                .getOutput(Task.OutputKind.DIRECT);
 
         if (!out.contains("public"))
             throw new AssertionError("The javap output does not contain \"public\"");