--- a/langtools/test/tools/javac/platform/PlatformProviderTest.java	Tue Mar 15 13:48:30 2016 -0700
+++ b/langtools/test/tools/javac/platform/PlatformProviderTest.java	Thu Mar 17 19:04:28 2016 +0000
@@ -28,6 +28,11 @@
  *          correctly.
  * @library /tools/lib
  * @build ToolBox PlatformProviderTest
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.platform
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.jdeps/com.sun.tools.javap
  * @run main/othervm PlatformProviderTest
  */
 
@@ -91,6 +96,8 @@
                   .outdir(".")
                   .options("-J-classpath",
                            "-J" + System.getProperty("test.classes"),
+                           "-J-XaddExports:jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED," +
+                                           "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                            "-XDrawDiagnostics",
                            "-release",
                            platformSpec,
@@ -125,6 +132,8 @@
                   .outdir(".")
                   .options("-J-classpath",
                            "-J" + System.getProperty("test.classes"),
+                           "-J-XaddExports:jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED," +
+                                           "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                            "-release",
                            "fail",
                            System.getProperty("test.src") + "/PlatformProviderTestSource.java")