--- old/test/java/lang/Class/GetModuleTest.java	2015-10-27 16:00:17.000000000 +0300
+++ new/test/java/lang/Class/GetModuleTest.java	2015-10-27 16:00:16.000000000 +0300
@@ -25,6 +25,7 @@
  * @test
  * @summary Exercise Class#getModule
  * @modules java.base/jdk.internal.org.objectweb.asm
+            java.desktop
  * @run testng GetModuleTest
  */
 
--- old/test/java/lang/Package/annotation/PackageInfoTest.java	2015-10-27 16:00:18.000000000 +0300
+++ new/test/java/lang/Package/annotation/PackageInfoTest.java	2015-10-27 16:00:17.000000000 +0300
@@ -25,6 +25,12 @@
  * @test
  * @summary Basic test of package-info in named module and duplicate
  *          package-info in unnamed module
+ * @modules java.compiler
+ *          java.desktop
+ *          java.management
+ *          jdk.attach
+ *          jdk.jdi
+ *          jdk.xml.dom
  * @compile package-info.java PackageInfoTest.java
  * @run testng p.PackageInfoTest
  */
--- old/test/jdk/jigsaw/etc/resources/ResourcesTest.java	2015-10-27 16:00:19.000000000 +0300
+++ new/test/jdk/jigsaw/etc/resources/ResourcesTest.java	2015-10-27 16:00:19.000000000 +0300
@@ -33,6 +33,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build ResourcesTest CompilerUtils jdk.testlibrary.*
  * @run testng ResourcesTest
  * @summary Driver for basic test of resource encapsulation
--- old/test/jdk/jigsaw/invoke/access/ModuleAccessControlTest.java	2015-10-27 16:00:20.000000000 +0300
+++ new/test/jdk/jigsaw/invoke/access/ModuleAccessControlTest.java	2015-10-27 16:00:20.000000000 +0300
@@ -35,6 +35,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build CompilerUtils jdk.testlibrary.*
  * @run testng ModuleAccessControlTest
  * @summary Driver for testing module access checking by MethodHandles.Lookup
--- old/test/jdk/jigsaw/launcher/addexports/AddExportsTest.java	2015-10-27 16:00:21.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/addexports/AddExportsTest.java	2015-10-27 16:00:21.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build AddExportsTest CompilerUtils jdk.testlibrary.*
  * @run testng AddExportsTest
  * @summary Basic tests for java -XaddExports
--- old/test/jdk/jigsaw/launcher/addmods/AddModsTest.java	2015-10-27 16:00:22.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/addmods/AddModsTest.java	2015-10-27 16:00:22.000000000 +0300
@@ -25,6 +25,7 @@
  * @test
  * @library ../../lib /lib/testlibrary
  * @modules jdk.jlink/jdk.tools.jmod
+ *          jdk.compiler
  * @build AddModsTest CompilerUtils jdk.testlibrary.*
  * @run testng AddModsTest
  * @summary Basic test for java -addmods
--- old/test/jdk/jigsaw/launcher/addreads/AddReadsTest.java	2015-10-27 16:00:23.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/addreads/AddReadsTest.java	2015-10-27 16:00:23.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build AddReadsTest CompilerUtils jdk.testlibrary.*
  * @run testng AddReadsTest
  * @summary Basic tests for java -XaddReads
--- old/test/jdk/jigsaw/launcher/basic/BasicTest.java	2015-10-27 16:00:24.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/basic/BasicTest.java	2015-10-27 16:00:24.000000000 +0300
@@ -26,6 +26,7 @@
  * @library ../../lib /lib/testlibrary
  * @modules jdk.jartool/sun.tools.jar
  *          jdk.jlink/jdk.tools.jmod
+ *          jdk.compiler
  * @build BasicTest CompilerUtils jdk.testlibrary.*
  * @run testng BasicTest
  * @summary Basic test of starting an application as a module
--- old/test/jdk/jigsaw/launcher/limitmods/LimitModsTest.java	2015-10-27 16:00:25.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/limitmods/LimitModsTest.java	2015-10-27 16:00:25.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build LimitModsTest CompilerUtils jdk.testlibrary.*
  * @run testng LimitModsTest
  * @summary Basic tests for java -limitmods
--- old/test/jdk/jigsaw/launcher/patch/PatchTest.java	2015-10-27 16:00:26.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/patch/PatchTest.java	2015-10-27 16:00:26.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build PatchTest CompilerUtils jdk.testlibrary.*
  * @run testng PatchTest
  * @summary Basic test for -Xpatch
--- old/test/jdk/jigsaw/launcher/upgrademodulepath/UpgradeModulePathTest.java	2015-10-27 16:00:27.000000000 +0300
+++ new/test/jdk/jigsaw/launcher/upgrademodulepath/UpgradeModulePathTest.java	2015-10-27 16:00:27.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build UpgradeModulePathTest CompilerUtils jdk.testlibrary.*
  * @run testng UpgradeModulePathTest
  * @summary Basic test for java -upgrademodulepath
--- old/test/jdk/jigsaw/module/ModuleReader/ModuleReaderTest.java	2015-10-27 16:00:28.000000000 +0300
+++ new/test/jdk/jigsaw/module/ModuleReader/ModuleReaderTest.java	2015-10-27 16:00:28.000000000 +0300
@@ -26,6 +26,7 @@
  * @library ../../lib
  * @modules java.base/jdk.internal.module
  *          jdk.jlink/jdk.tools.jmod
+ *          jdk.compiler
  * @build ModuleReaderTest CompilerUtils JarUtils
  * @run testng ModuleReaderTest
  * @summary Basic tests for java.lang.module.ModuleReader
--- old/test/jdk/jigsaw/reflect/Module/BasicModuleTest.java	2015-10-27 16:00:30.000000000 +0300
+++ new/test/jdk/jigsaw/reflect/Module/BasicModuleTest.java	2015-10-27 16:00:29.000000000 +0300
@@ -34,6 +34,7 @@
 /*
  * @test
  * @summary Basic test of java.lang.reflect.Module
+ * @modules java.desktop java.xml
  * @run testng BasicModuleTest
  */
 
--- old/test/jdk/jigsaw/reflect/Module/access/AccessTest.java	2015-10-27 16:00:31.000000000 +0300
+++ new/test/jdk/jigsaw/reflect/Module/access/AccessTest.java	2015-10-27 16:00:30.000000000 +0300
@@ -35,6 +35,7 @@
 /**
  * @test
  * @library ../../../lib /lib/testlibrary
+ * @modules java.compiler
  * @build AccessTest CompilerUtils jdk.testlibrary.*
  * @run testng AccessTest
  * @summary Driver for test that checks access to public members in exported
--- old/test/jdk/jigsaw/reflect/Proxy/ProxyClassAccessTest.java	2015-10-27 16:00:32.000000000 +0300
+++ new/test/jdk/jigsaw/reflect/Proxy/ProxyClassAccessTest.java	2015-10-27 16:00:31.000000000 +0300
@@ -36,6 +36,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build ProxyClassAccessTest CompilerUtils jdk.testlibrary.*
  * @run testng ProxyClassAccessTest
  * @summary Driver for testing proxy class doesn't have access to
--- old/test/jdk/jigsaw/reflect/Proxy/ProxyLayerTest.java	2015-10-27 16:00:33.000000000 +0300
+++ new/test/jdk/jigsaw/reflect/Proxy/ProxyLayerTest.java	2015-10-27 16:00:32.000000000 +0300
@@ -42,6 +42,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build ProxyTest CompilerUtils jdk.testlibrary.ProcessTools
  * @run testng ProxyLayerTest
  * @summary Test proxies to implement interfaces in a layer
--- old/test/jdk/jigsaw/reflect/Proxy/ProxyTest.java	2015-10-27 16:00:34.000000000 +0300
+++ new/test/jdk/jigsaw/reflect/Proxy/ProxyTest.java	2015-10-27 16:00:34.000000000 +0300
@@ -35,6 +35,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build ProxyTest q.U CompilerUtils jdk.testlibrary.*
  * @run testng ProxyTest
  * @summary Driver for testing proxies accessing interfaces in named modules
--- old/test/jdk/jigsaw/scenarios/automaticmodules/RunWithAutomaticModules.java	2015-10-27 16:00:35.000000000 +0300
+++ new/test/jdk/jigsaw/scenarios/automaticmodules/RunWithAutomaticModules.java	2015-10-27 16:00:35.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build RunWithAutomaticModules CompilerUtils JarUtils
  *        jdk.testlibrary.ProcessTools
  * @run testng RunWithAutomaticModules
@@ -176,4 +177,4 @@
 
     }
 
-}
\ No newline at end of file
+}
--- old/test/jdk/jigsaw/scenarios/container/ContainerTest.java	2015-10-27 16:00:36.000000000 +0300
+++ new/test/jdk/jigsaw/scenarios/container/ContainerTest.java	2015-10-27 16:00:36.000000000 +0300
@@ -25,6 +25,7 @@
  * @test
  * @library ../../lib /lib/testlibrary
  * @modules jdk.jartool/sun.tools.jar
+ *          jdk.compiler
  * @build ContainerTest CompilerUtils jdk.testlibrary.*
  * @run testng ContainerTest
  * @summary Starts a simple container that uses dynamic configurations
--- old/test/jdk/jigsaw/scenarios/overlappingpackages/OverlappingPackagesTest.java	2015-10-27 16:00:37.000000000 +0300
+++ new/test/jdk/jigsaw/scenarios/overlappingpackages/OverlappingPackagesTest.java	2015-10-27 16:00:37.000000000 +0300
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules jdk.compiler
  * @build OverlappingPackagesTest CompilerUtils jdk.testlibrary.*
  * @run testng OverlappingPackagesTest
  * @summary Basic test to ensure that startup fails if two or more modules
--- old/test/jdk/jigsaw/tools/jimage/JImageTest.java	2015-10-27 16:00:38.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jimage/JImageTest.java	2015-10-27 16:00:38.000000000 +0300
@@ -52,6 +52,7 @@
  *          jdk.jlink/jdk.tools.jlink
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.compiler
  * @run build JImageTest
  * @run build tests.*
  * @run main/othervm -verbose:gc -Xmx1g JImageTest
--- old/test/jdk/jigsaw/tools/jlink/CustomImageBuilderTest.java	2015-10-27 16:00:39.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/CustomImageBuilderTest.java	2015-10-27 16:00:39.000000000 +0300
@@ -33,6 +33,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run testng/othervm CustomImageBuilderTest
  */
--- old/test/jdk/jigsaw/tools/jlink/CustomPluginTest.java	2015-10-27 16:00:40.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/CustomPluginTest.java	2015-10-27 16:00:40.000000000 +0300
@@ -45,6 +45,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm CustomPluginTest
  */
--- old/test/jdk/jigsaw/tools/jlink/DefaultProviderTest.java	2015-10-27 16:00:41.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/DefaultProviderTest.java	2015-10-27 16:00:41.000000000 +0300
@@ -44,6 +44,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm DefaultProviderTest
  */
--- old/test/jdk/jigsaw/tools/jlink/IntegrationTest.java	2015-10-27 16:00:42.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/IntegrationTest.java	2015-10-27 16:00:42.000000000 +0300
@@ -62,6 +62,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main IntegrationTest
  */
--- old/test/jdk/jigsaw/tools/jlink/JLink2Test.java	2015-10-27 16:00:43.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLink2Test.java	2015-10-27 16:00:43.000000000 +0300
@@ -32,6 +32,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm -verbose:gc -Xmx1g JLink2Test
  */
--- old/test/jdk/jigsaw/tools/jlink/JLinkNegativeTest.java	2015-10-27 16:00:45.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLinkNegativeTest.java	2015-10-27 16:00:44.000000000 +0300
@@ -34,6 +34,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run testng JLinkNegativeTest
  */
--- old/test/jdk/jigsaw/tools/jlink/JLinkOptimTest.java	2015-10-27 16:00:46.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLinkOptimTest.java	2015-10-27 16:00:45.000000000 +0300
@@ -83,6 +83,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          java.base/jdk.internal.org.objectweb.asm.util
+ *          jdk.compiler
  * @build tests.*
  * @run main JLinkOptimTest
  */
--- old/test/jdk/jigsaw/tools/jlink/JLinkOptionsTest.java	2015-10-27 16:00:47.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLinkOptionsTest.java	2015-10-27 16:00:46.000000000 +0300
@@ -39,6 +39,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main JLinkOptionsTest
  */
--- old/test/jdk/jigsaw/tools/jlink/JLinkPluginsTest.java	2015-10-27 16:00:48.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLinkPluginsTest.java	2015-10-27 16:00:47.000000000 +0300
@@ -42,6 +42,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm -verbose:gc -Xmx1g JLinkPluginsTest
  */
--- old/test/jdk/jigsaw/tools/jlink/JLinkPostProcessingTest.java	2015-10-27 16:00:49.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLinkPostProcessingTest.java	2015-10-27 16:00:48.000000000 +0300
@@ -50,6 +50,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm JLinkPostProcessingTest
  */
--- old/test/jdk/jigsaw/tools/jlink/JLinkTest.java	2015-10-27 16:00:50.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/JLinkTest.java	2015-10-27 16:00:50.000000000 +0300
@@ -51,6 +51,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm -verbose:gc -Xmx1g JLinkTest
  */
--- old/test/jdk/jigsaw/tools/jlink/NativeTest.java	2015-10-27 16:00:51.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/NativeTest.java	2015-10-27 16:00:51.000000000 +0300
@@ -32,6 +32,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main NativeTest
  */
--- old/test/jdk/jigsaw/tools/jlink/basic/BasicTest.java	2015-10-27 16:00:52.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/basic/BasicTest.java	2015-10-27 16:00:52.000000000 +0300
@@ -29,6 +29,7 @@
  * @modules java.base/jdk.internal.module
  *          jdk.jlink/jdk.tools.jlink
  *          jdk.jlink/jdk.tools.jmod
+ *          jdk.compiler
  * @build jdk.testlibrary.ProcessTools
  *        jdk.testlibrary.OutputAnalyzer
  *        JarUtils CompilerUtils
--- old/test/jdk/jigsaw/tools/jlink/hashes/HashesTest.java	2015-10-27 16:00:53.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/hashes/HashesTest.java	2015-10-27 16:00:53.000000000 +0300
@@ -29,6 +29,7 @@
  * @modules java.base/jdk.internal.module
  *          jdk.jlink/jdk.tools.jlink
  *          jdk.jlink/jdk.tools.jmod
+ *          jdk.compiler
  * @ignore
  * @build jdk.testlibrary.ProcessTools jdk.testlibrary.OutputAnalyzer CompilerUtils
  * @run main HashesTest
--- old/test/jdk/jigsaw/tools/jlink/plugins/PluginOrderTest.java	2015-10-27 16:00:54.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/plugins/PluginOrderTest.java	2015-10-27 16:00:54.000000000 +0300
@@ -32,6 +32,7 @@
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.compiler
  * @build tests.*
  * @run main/othervm PluginOrderTest
  */
--- old/test/jdk/jigsaw/tools/jlink/plugins/StringSharingPluginTest.java	2015-10-27 16:00:55.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/plugins/StringSharingPluginTest.java	2015-10-27 16:00:55.000000000 +0300
@@ -34,6 +34,7 @@
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.jdeps/com.sun.tools.classfile
+ *          jdk.compiler
  * @run build tests.*
  * @run main StringSharingPluginTest
  */
--- old/test/jdk/jigsaw/tools/jlink/plugins/StripDebugPluginTest.java	2015-10-27 16:00:56.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jlink/plugins/StripDebugPluginTest.java	2015-10-27 16:00:56.000000000 +0300
@@ -34,6 +34,7 @@
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jdeps/com.sun.tools.classfile
+ *          jdk.compiler
  * @run main StripDebugPluginTest
  */
 
--- old/test/jdk/jigsaw/tools/jmod/JmodNegativeTest.java	2015-10-27 16:00:58.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jmod/JmodNegativeTest.java	2015-10-27 16:00:57.000000000 +0300
@@ -25,6 +25,7 @@
  * @test
  * @modules jdk.jlink/jdk.tools.jmod
  * @library /lib/testlibrary /jdk/jigsaw/lib
+ * @modules jdk.compiler
  * @build jdk.testlibrary.FileUtils CompilerUtils
  * @run testng JmodNegativeTest
  * @summary Negative tests for jmod
@@ -548,4 +549,4 @@
         JmodResult assertFailure() { assertTrue(exitCode != 0, output); return this; }
         JmodResult resultChecker(Consumer<JmodResult> r) { r.accept(this); return this; }
     }
-}
\ No newline at end of file
+}
--- old/test/jdk/jigsaw/tools/jmod/JmodTest.java	2015-10-27 16:00:59.000000000 +0300
+++ new/test/jdk/jigsaw/tools/jmod/JmodTest.java	2015-10-27 16:00:58.000000000 +0300
@@ -23,8 +23,9 @@
 
 /*
  * @test
- * @modules jdk.jlink/jdk.tools.jmod
  * @library /jdk/jigsaw/lib /lib/testlibrary
+ * @modules jdk.jlink/jdk.tools.jmod
+ *          jdk.compiler
  * @build jdk.testlibrary.FileUtils CompilerUtils
  * @run testng JmodTest
  * @summary Basic test for jmod
--- old/test/jdk/jigsaw/util/ServiceLoader/ServicesTest.java	2015-10-27 16:01:00.000000000 +0300
+++ new/test/jdk/jigsaw/util/ServiceLoader/ServicesTest.java	2015-10-27 16:00:59.000000000 +0300
@@ -40,6 +40,8 @@
 /**
  * @test
  * @library ../../lib /lib/testlibrary
+ * @modules java.scripting
+            jdk.compiler
  * @build ServicesTest CompilerUtils jdk.testlibrary.*
  * @run testng ServicesTest
  * @summary Tests ServiceLoader to locate service providers on the module path