--- a/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -27,13 +27,14 @@
  * @summary compile of iterator use fails with error "defined in an inaccessible class or 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.JavacTask
  * @run main CompileErrorWithIteratorTest
  */
 
+import toolbox.JavacTask;
+import toolbox.ToolBox;
+
 public class CompileErrorWithIteratorTest {
 
     private static final String TestCollectionSrc =
@@ -80,7 +81,7 @@
     }
 
     void compile() throws Exception {
-        tb.new JavacTask()
+        new JavacTask(tb)
                 .sources(TestCollectionSrc, TestSrc)
                 .run();
     }