--- a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.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
@@ -42,6 +42,10 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
 public class ModuleTestBase {
     protected final ToolBox tb = new ToolBox();
     private final TestResult tr = new TestResult();
@@ -124,9 +128,9 @@
     }
 
     protected void compile(Path base) throws IOException {
-        tb.new JavacTask()
+        new JavacTask(tb)
                 .files(findJavaFiles(base))
-                .run(ToolBox.Expect.SUCCESS)
+                .run(Task.Expect.SUCCESS)
                 .writeAll();
     }