--- a/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -29,16 +29,18 @@
  * header file.
  * @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.JavahTask
  * @run main ConstMacroTest
  */
 
 import java.io.*;
 import java.util.List;
 
+import toolbox.JavahTask;
+import toolbox.ToolBox;
+
 // Original test: test/tools/javah/ConstMacroTest.sh
 public class ConstMacroTest {
 
@@ -78,7 +80,7 @@
     public static void main(String[] args) throws Exception {
         ToolBox tb = new ToolBox();
 
-        tb.new JavahTask()
+        new JavahTask(tb)
                 .classpath(ToolBox.testClasses)
                 .classes("SubClassConsts")
                 .run();