--- a/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,18 @@
  * @summary Inferring the exception thrown by a lambda: sometimes fails to compile
  * @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 ExceptionInferenceFromClassFileTest
  */
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import toolbox.JavacTask;
+import toolbox.ToolBox;
+
 public class ExceptionInferenceFromClassFileTest {
 
     static final String ABSrc =
@@ -61,12 +63,12 @@
         ToolBox tb = new ToolBox();
         tb.createDirectories("out");
 
-        tb.new JavacTask()
+        new JavacTask(tb)
                 .outdir("out")
                 .sources(ABSrc)
                 .run();
 
-        tb.new JavacTask()
+        new JavacTask(tb)
                 .outdir("out")
                 .classpath("out")
                 .sources(CSrc)