--- old/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java	2016-08-07 17:47:36.000000000 -0700
+++ new/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java	2016-08-07 17:47:35.000000000 -0700
@@ -35,6 +35,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -127,8 +128,9 @@
         tr.checkContains(actualProvides, moduleDescriptor.provides, "Lists of provides don't match");
     }
 
-    protected void compile(Path base) throws IOException {
+    protected void compile(Path base, String... options) throws IOException {
         new JavacTask(tb)
+                .options(options)
                 .files(findJavaFiles(base))
                 .run(Task.Expect.SUCCESS)
                 .writeAll();