--- a/langtools/test/tools/javac/T6358024.java	Tue Mar 15 13:48:30 2016 -0700
+++ b/langtools/test/tools/javac/T6358024.java	Thu Mar 17 19:04:28 2016 +0000
@@ -38,9 +38,7 @@
 import javax.tools.*;
 import com.sun.source.util.*;
 import com.sun.tools.javac.api.*;
-import com.sun.tools.javac.file.*;
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.main.*;
 import com.sun.tools.javac.util.*;
 
 
@@ -71,6 +69,10 @@
 
         JavacTool tool = JavacTool.create();
         List<String> flags = new ArrayList<String>();
+        flags.add("-XaddExports:"
+                + "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED,"
+                + "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED,"
+                + "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
         for (Option opt: opts) {
             flags.add(opt.name);
             for (Object arg : opt.args)