--- a/langtools/test/tools/javac/modules/NPEEmptyFileTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/modules/NPEEmptyFileTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -28,14 +28,17 @@
  * @modules
  *      jdk.compiler/com.sun.tools.javac.api
  *      jdk.compiler/com.sun.tools.javac.main
- *      jdk.jdeps/com.sun.tools.javap
- * @build ToolBox ModuleTestBase
+ * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
  * @run main NPEEmptyFileTest
  */
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
 public class NPEEmptyFileTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
         new NPEEmptyFileTest().runTests();
@@ -47,7 +50,7 @@
         Files.createDirectories(modules);
         Path emptyJavaFile = base.resolve("Test.java");
         tb.writeFile(emptyJavaFile, "");
-        tb.new JavacTask(ToolBox.Mode.EXEC)
+        new JavacTask(tb, Task.Mode.EXEC)
                 .options("-modulesourcepath", modules.toString(),
                         "-d", modules.toString(), emptyJavaFile.toString())
                 .run()