--- a/langtools/test/tools/javac/modules/ServiceInStaticClassErrorTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/modules/ServiceInStaticClassErrorTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -29,8 +29,7 @@
  * @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 ServiceInStaticClassErrorTest
  */
 
@@ -38,6 +37,10 @@
 import java.nio.file.Path;
 import java.util.List;
 
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
 public class ServiceInStaticClassErrorTest extends ModuleTestBase {
     public static void main(String... args) throws Exception {
         ServiceInStaticClassErrorTest t = new ServiceInStaticClassErrorTest();
@@ -54,12 +57,12 @@
         Path classes = base.resolve("classes");
         Files.createDirectories(classes);
 
-        List<String> output = tb.new JavacTask()
+        List<String> output = new JavacTask(tb)
                 .outdir(classes)
                 .files(findJavaFiles(src))
                 .run()
                 .writeAll()
-                .getOutputLines(ToolBox.OutputKind.DIRECT);
+                .getOutputLines(Task.OutputKind.DIRECT);
     }
 
 }