--- old/langtools/test/tools/sjavac/IncludeExcludePatterns.java	2016-08-07 17:48:22.000000000 -0700
+++ new/langtools/test/tools/sjavac/IncludeExcludePatterns.java	2016-08-07 17:48:22.000000000 -0700
@@ -26,17 +26,14 @@
  * @bug 8037085
  * @summary Ensures that sjavac can handle various exclusion patterns.
  *
- * @modules jdk.compiler/com.sun.tools.sjavac
- *          jdk.jdeps/com.sun.tools.javap
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
+ *          jdk.compiler/com.sun.tools.sjavac.server
  * @library /tools/lib
- * @build Wrapper toolbox.ToolBox
+ * @build Wrapper toolbox.ToolBox toolbox.Assert
  * @run main Wrapper IncludeExcludePatterns
  */
 
-import com.sun.tools.javac.main.Main.Result;
-import com.sun.tools.javac.util.Assert;
-import com.sun.tools.sjavac.server.Sjavac;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -49,6 +46,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.sun.tools.javac.main.Main.Result;
+
+import toolbox.Assert;
+
 public class IncludeExcludePatterns extends SjavacBase {
 
     final Path SRC = Paths.get("src");