--- a/langtools/test/tools/javap/stackmap/StackmapTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javap/stackmap/StackmapTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -27,16 +27,20 @@
  * @summary Verify that javap prints StackMapTable attribute contents
  * @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.JavacTask toolbox.JavapTask
  * @run main StackmapTest
  */
 
 import java.util.ArrayList;
 import java.util.List;
 
+import toolbox.JavacTask;
+import toolbox.JavapTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
 // Original test: test/tools/javap/stackmap/T6271292.sh
 public class StackmapTest {
 
@@ -80,15 +84,15 @@
     public static void main(String[] args) throws Exception {
         ToolBox tb = new ToolBox();
 
-        tb.new JavacTask()
+        new JavacTask(tb)
                 .sources(TestSrc)
                 .run();
 
-        List<String> out = tb.new JavapTask()
+        List<String> out = new JavapTask(tb)
                 .options("-v")
                 .classes("Test.class")
                 .run()
-                .getOutputLines(ToolBox.OutputKind.DIRECT);
+                .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> grepResult = new ArrayList<>();
         grepResult.addAll(tb.grep("frame_type",   out));