--- a/jdk/test/com/sun/corba/transport/KeepAliveSockets.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/corba/transport/KeepAliveSockets.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 8017195
  * @summary Introduce option to setKeepAlive parameter on CORBA sockets
  *
+ * @modules java.corba/com.sun.corba.se.impl.orb java.corba/com.sun.corba.se.impl.transport
  * @run main/othervm KeepAliveSockets
  * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive KeepAliveSockets
  * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=true KeepAliveSockets

--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,7 @@
  * @bug 8044193
  * @summary Test AES ciphers with different modes and padding schemes after
  *  remove then add provider.
+ * @modules java.base/com.sun.crypto.provider
  * @run main/othervm/policy=testAES.policy TestAESWithProviderChange
  */
 

--- a/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java	Thu May 28 10:54:48 2015 -0700
@@ -24,9 +24,10 @@
 /*
  * @test
  * @bug 5008159 5008156
- * @run main XMLEncKAT
  * @summary Verify that the two key wrap ciphers, i.e. "DESedeWrap"
  * and "AESWrap", work as expected.
+ * @modules java.base/sun.misc
+ * @run main XMLEncKAT
  * @author Valerie Peng
  */
 import java.security.Key;

--- a/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6313661
  * @summary Known-answer-test for TlsKeyMaterial generator
  * @author Andreas Sterbenz
+ * @modules java.base/sun.security.internal.spec
  */
 
 import java.io.*;

--- a/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,8 @@
  * @bug 6313661
  * @summary Known-answer-test for TlsMasterSecret generator
  * @author Andreas Sterbenz
+ * @modules java.base/sun.security.internal.interfaces
+ *          java.base/sun.security.internal.spec
  */
 
 import java.io.*;

--- a/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6313661
  * @summary Basic known-answer-test for TlsPrf
  * @author Andreas Sterbenz
+ * @modules java.base/sun.security.internal.spec
  */
 
 import java.io.*;

--- a/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 6313661
+ * @modules java.base/sun.security.internal.spec
  * @summary Basic known-answer-test for TlsPrf 12
  *
  * Vector obtained from the IETF TLS working group mailing list:

--- a/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6313661
  * @summary Basic tests for TlsRsaPremasterSecret generator
  * @author Andreas Sterbenz
+ * @modules java.base/sun.security.internal.spec
  */
 
 import java.security.Security;

--- a/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @bug 4238914
  * @summary Tests that JNDI/COS naming parser supports the syntax
  * defined in the new INS standard.
+ * @modules java.corba/com.sun.jndi.cosnaming
  */
 
 import javax.naming.*;

--- a/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 5042453
  * @summary Ipv6 address throws Non-numeric port number error
+ * @modules java.corba/com.sun.jndi.cosnaming
  */
 
 import com.sun.jndi.cosnaming.*;

--- a/jdk/test/com/sun/jndi/dns/Parser.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/dns/Parser.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8035105
  * @summary DNS resource record parsing
+ * @modules jdk.naming.dns/com.sun.jndi.dns
  */
 
 import com.sun.jndi.dns.ResourceRecord;

--- a/jdk/test/com/sun/jndi/ldap/Base64Test.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/ldap/Base64Test.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8035807
  * @summary Confirm that old and new Base64 encodings are compatible.
+ * @modules java.base/sun.misc
  */
 
 import java.io.*;

--- a/jdk/test/com/sun/jndi/ldap/LdapName/Case.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/ldap/LdapName/Case.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 4278094
  * @summary Ensure that setValuesCaseSensitive() does not leave name
  *      in an invalid state.
+ * @modules java.naming/com.sun.jndi.ldap
  */
 
 import com.sun.jndi.ldap.LdapName;

--- a/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 4892070
  * @summary java gets hung in
  *      com.sun.jndi.ldap.LdapName$TypeAndValue.unescapeValue()
+ * @modules java.naming/com.sun.jndi.ldap
  */
 
 import com.sun.jndi.ldap.LdapName;

--- a/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8074761
  * @summary RFC-2255 allows attribute, scope and filter to be empty.
+ * @modules java.naming/com.sun.jndi.ldap
  */
 
 import com.sun.jndi.ldap.LdapURL;

--- a/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6961765
  * @summary Double byte characters corrupted in DN for LDAP referrals
+ * @modules java.naming/com.sun.jndi.ldap
  */
 
 import com.sun.jndi.ldap.LdapURL;

--- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,8 @@
  * @test
  * @bug 6676075
  * @summary RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem
+ * @modules jdk.naming.rmi/com.sun.jndi.rmi.registry java.rmi/sun.rmi.registry
+ *     java.rmi/sun.rmi.server java.rmi/sun.rmi.transport java.rmi/sun.rmi.transport.tcp
  * @library ../../../../../../java/rmi/testlibrary
  * @build TestLibrary
  * @run main ContextWithNullProperties

--- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java	Thu May 28 10:54:48 2015 -0700
@@ -25,7 +25,9 @@
  * @test
  * @bug 4278121
  * @summary Ensure that calling unbind() on an unbound name returns
- *      successfully.
+ *     successfully.
+ * @modules java.rmi/sun.rmi.registry java.rmi/sun.rmi.server
+ *     java.rmi/sun.rmi.transport java.rmi/sun.rmi.transport.tcp
  * @library ../../../../../../java/rmi/testlibrary
  * @build TestLibrary
  * @run main UnbindIdempotent

--- a/jdk/test/com/sun/management/VMOptionOpenDataTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/management/VMOptionOpenDataTest.java	Thu May 28 10:54:48 2015 -0700
@@ -31,6 +31,8 @@
  * @test
  * @bug     8042901
  * @summary Check that MappedMXBeanType.toOpenTypeData supports VMOption
+ * @modules java.management/sun.management
+ *          jdk.management/com.sun.management
  * @author  Shanliang Jiang
  */
 public class VMOptionOpenDataTest {

--- a/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4667976
+ * @modules java.base/com.sun.net.ssl
  * @compile JavaxSSLContextImpl.java ComSSLContextImpl.java
  *      JavaxTrustManagerFactoryImpl.java ComTrustManagerFactoryImpl.java
  *      JavaxKeyManagerFactoryImpl.java ComKeyManagerFactoryImpl.java

--- a/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4665824
  * @summary JSSE - ClassCastException with 1.4
+ * @modules java.base/com.sun.net.ssl
  */
 
 import com.sun.net.ssl.*;

--- a/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 6824440 6858484
  * @summary Check that Apache XMLSec APIs will not accept HMAC truncation
  *    lengths less than minimum bound
+ * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security
+ *          java.xml.crypto/com.sun.org.apache.xml.internal.security.c14n
+ *          java.xml.crypto/com.sun.org.apache.xml.internal.security.signature
+ *          java.xml.crypto/com.sun.org.apache.xml.internal.security.utils
  * @compile -XDignore.symbol.file TruncateHMAC.java
  * @run main TruncateHMAC
  */

--- a/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6454215
  * @summary Make sure there are no runtime errors when throwing Apache XML
  *      Security exceptions in a non-US default locale.
+ * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security.exceptions
  * @compile -XDignore.symbol.file LocaleTest.java
  * @run main LocaleTest
  */

--- a/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,8 @@
  * @test
  * @author Sean Mullan
  * @bug 6461674 8009217 7147060
+ * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security.exceptions
+ *          java.xml.crypto/com.sun.org.apache.xml.internal.security.transforms
  * @compile -XDignore.symbol.file ClassLoaderTest.java MyTransform.java
  * @run main/othervm ClassLoaderTest
  * @summary Ensure Transform.register works with transform implementations

--- a/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6954275
  * @summary Check that UnsyncByteArrayOutputStream does not
  *          throw ArrayIndexOutOfBoundsException
+ * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security.utils
  * @compile -XDignore.symbol.file BufferOverflowTest.java
  * @run main BufferOverflowTest
  */

--- a/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,8 @@
  * @test
  * @bug 6911951 7150092
  * @summary NTLM should be a supported Java SASL mechanism
+ * @modules java.base/sun.misc
+ *          java.security.sasl
  */
 import java.io.IOException;
 import javax.security.sasl.*;

--- a/jdk/test/com/sun/tools/attach/BasicTests.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java	Thu May 28 10:54:48 2015 -0700
@@ -37,6 +37,7 @@
  * @test
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
+ * @modules jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @modules java.instrument
  *          java.management

--- a/jdk/test/com/sun/tools/attach/PermissionTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/PermissionTest.java	Thu May 28 10:54:48 2015 -0700
@@ -32,6 +32,7 @@
  * @test
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
+ * @modules jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @modules java.management
  *          jdk.attach

--- a/jdk/test/com/sun/tools/attach/ProviderTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/ProviderTest.java	Thu May 28 10:54:48 2015 -0700
@@ -32,6 +32,7 @@
  * @test
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
+ * @modules jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @modules java.management
  *          jdk.attach

--- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java	Thu May 28 10:54:48 2015 -0700
@@ -39,6 +39,7 @@
 /*
  * @test
  * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
+ * @modules jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @modules java.management
  *          jdk.attach

--- a/jdk/test/com/sun/tools/attach/TempDirTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/com/sun/tools/attach/TempDirTest.java	Thu May 28 10:54:48 2015 -0700
@@ -37,6 +37,7 @@
  * @test
  * @bug 8033104
  * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
+ * @modules jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @modules java.management
  *          jdk.jartool/sun.tools.jar

--- a/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 8057919
  * @summary Class.getSimpleName() should work for non-JLS compliant class names
+ * @modules java.base/jdk.internal.org.objectweb.asm
  */
 import jdk.internal.org.objectweb.asm.*;
 import static jdk.internal.org.objectweb.asm.Opcodes.*;

--- a/jdk/test/java/lang/ProcessBuilder/Basic.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,7 @@
  *      4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464
  *      8067796
  * @summary Basic tests for Process and Environment Variable code
+ * @modules java.base/sun.misc
  * @run main/othervm/timeout=300 Basic
  * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
  * @author Martin Buchholz

--- a/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8072611
  * @summary ProcessBuilder Redirect to file appending on Windows should work with long file names
+ * @modules java.base/sun.misc
  * @author Thomas Stuefe
  */
 

--- a/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test inheritance, order and class redefinition behaviour of RUNTIME
  *          class annotations
  * @author plevart
+ * @modules java.base/sun.reflect.annotation
  */
 
 import sun.reflect.annotation.AnnotationParser;

--- a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java	Thu May 28 10:54:48 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8022701
  * @summary Illegal access exceptions via methodhandle invocations threw wrong error.
- *
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @compile -XDignore.symbol.file BogoLoader.java InvokeSeveralWays.java MHIllegalAccess.java MethodSupplier.java
  * @run main/othervm MHIllegalAccess
  */

--- a/jdk/test/java/lang/invoke/RevealDirectTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/RevealDirectTest.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary verify Lookup.revealDirect on a variety of input handles
+ * @modules java.base/sun.reflect
  * @compile -XDignore.symbol.file RevealDirectTest.java
  * @run junit/othervm -ea -esa test.java.lang.invoke.RevealDirectTest
  *

--- a/jdk/test/java/lang/invoke/VMAnonymousClass.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/VMAnonymousClass.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 8046903
  * @summary VM anonymous class members can't be statically invocable
+ * @modules java.base/sun.misc java.base/jdk.internal.org.objectweb.asm
  * @run junit test.java.lang.invoke.VMAnonymousClass
  */
 package test.java.lang.invoke;

--- a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java	Thu May 28 10:54:48 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8022718
  * @summary Runtime accessibility checking: protected class, if extended, should be accessible from another package
- *
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @compile -XDignore.symbol.file BogoLoader.java MethodInvoker.java Test.java anotherpkg/MethodSupplierOuter.java
  * @run main/othervm Test
  */

--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java	Thu May 28 10:54:48 2015 -0700
@@ -76,7 +76,7 @@
         doprivJava.delete();
         doprivClass.delete();
         tr = doExec(JAVA_CMD.getAbsolutePath(),
-                    "-Xbootclasspath/p:foo.jar",
+                    "-Xbootclasspath/a:foo.jar",
                     "-cp", ".", "Bar");
         tr.assertZero("testDoPrivileged fails");
         barJava.delete();

--- a/jdk/test/java/lang/invoke/lambda/LambdaAsm.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAsm.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,8 @@
  * @bug 8027232
  * @summary ensures that j.l.i.InvokerByteCodeGenerator and ASM visitMethodInsn
  * generate  bytecodes with correct constant pool references
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          jdk.compiler/com.sun.tools.classfile
  * @compile -XDignore.symbol.file LambdaAsm.java LUtils.java
  * @run main/othervm LambdaAsm
  */
@@ -133,7 +135,7 @@
         int mcount = 0;
         try (DirectoryStream<Path> ds = newDirectoryStream(new File(".").toPath(),
                 // filter in lambda proxy classes
-                "A$I$$Lambda$?.class")) {
+                "A$I$$Lambda$*.class")) {
             for (Path p : ds) {
                 System.out.println(p.toFile());
                 ClassFile cf = ClassFile.read(p.toFile());

--- a/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8025636
  * @summary Synthetic frames should be hidden in exceptions
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @compile -XDignore.symbol.file LUtils.java LambdaStackTrace.java
  * @run main LambdaStackTrace
  */

--- a/jdk/test/java/lang/invoke/lookup/SpecialStatic.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/invoke/lookup/SpecialStatic.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 8032400
  * @summary JSR292: invokeSpecial: InternalError attempting to lookup a method
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @compile -XDignore.symbol.file SpecialStatic.java
  * @run junit test.java.lang.invoke.lookup.SpecialStatic
  */

--- a/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6832374 7052898
  * @summary Test bad signatures get a GenericSignatureFormatError thrown.
  * @author Joseph D. Darcy
+ * @modules java.base/sun.reflect.generics.parser
  */
 
 import java.lang.reflect.*;

--- a/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 8026213
  * @summary Reflection support for private methods in interfaces
  * @author  Robert Field
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @run main TestPrivateInterfaceMethodReflect
  */
 

--- a/jdk/test/java/net/Authenticator/B4678055.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Authenticator/B4678055.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4678055
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
  * @run main B4678055

--- a/jdk/test/java/net/Authenticator/B4722333.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Authenticator/B4722333.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4722333
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
  * @run main B4722333

--- a/jdk/test/java/net/Authenticator/B4759514.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Authenticator/B4759514.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4759514
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
  * @run main B4759514

--- a/jdk/test/java/net/Authenticator/B4921848.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Authenticator/B4921848.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4921848
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
  * @run main/othervm -Dhttp.auth.preference=basic B4921848

--- a/jdk/test/java/net/Authenticator/B4962064.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Authenticator/B4962064.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4962064
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
  * @run main/othervm B4962064

--- a/jdk/test/java/net/Authenticator/B6870935.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Authenticator/B6870935.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 6870935
+ * @modules java.base/sun.net.www
  * @run main/othervm -Dhttp.nonProxyHosts="" -Dhttp.auth.digest.validateProxy=true B6870935
  */
 

--- a/jdk/test/java/net/Inet4Address/textToNumericFormat.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Inet4Address/textToNumericFormat.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4749938
  * @summary Bug in the parsing IPv4 literal addresses
+ * @modules java.base/sun.net.spi.nameservice
  * @compile -XDignore.symbol.file=true DummyNameService.java DummyNameServiceDescriptor.java
  * @run main/othervm -Dsun.net.spi.nameservice.provider.1=dummy,oracle textToNumericFormat
 */

--- a/jdk/test/java/net/ProxySelector/LoopbackAddresses.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/ProxySelector/LoopbackAddresses.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4924226
  * @summary PIT: Can no launch jnlp application via 127.0.0.1 address on the web server
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
  * @compile LoopbackAddresses.java

--- a/jdk/test/java/net/ProxySelector/ProxyTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/ProxySelector/ProxyTest.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4696512
  * @summary HTTP client: Improve proxy server configuration and selection
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
  * @compile ProxyTest.java

--- a/jdk/test/java/net/Socket/HttpProxy.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/Socket/HttpProxy.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6370908
  * @summary Add support for HTTP_CONNECT proxy in Socket class
+ * @modules java.base/sun.net.www
  */
 
 import java.io.IOException;

--- a/jdk/test/java/net/URL/PerConnectionProxy.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/URL/PerConnectionProxy.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4920526
  * @summary Needs per connection proxy support for URLs
+ * @modules java.base/sun.net.www
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback
  * @compile PerConnectionProxy.java

--- a/jdk/test/java/net/URL/SpecifyHandler.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/URL/SpecifyHandler.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 4135031
  * @summary Test new URL contructors that allow specification of a
  *          URLStreamHandler protocol handler.
+ * @modules java.base/sun.net.www.protocol.file
  */
 import java.net.*;
 

--- a/jdk/test/java/net/URLConnection/B5052093.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/URLConnection/B5052093.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 5052093
+ * @modules java.base/sun.net.www java.base/sun.net.www.protocol.file
  * @library ../../../sun/net/www/httptest/
  * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction
  * @run main B5052093

--- a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 4160200
  * @summary Make sure URLConnection.getContnentHandler
  *     can handle MIME types with attributes
+ * @modules java.base/sun.net.www java.base/sun.net.www.content.text
  */
 import java.net.*;
 import java.io.*;

--- a/jdk/test/java/nio/file/Files/InterruptCopy.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/nio/file/Files/InterruptCopy.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4313887 6993267
  * @summary Unit test for Sun-specific ExtendedCopyOption.INTERRUPTIBLE option
+ * @modules java.base/com.sun.nio.file
  * @library ..
  */
 

--- a/jdk/test/java/nio/file/Files/SBC.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/nio/file/Files/SBC.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @bug 4313887
  * @summary Unit test for java.nio.file.Files.newByteChannel
  * @library ..
+ * @modules java.base/com.sun.nio.file
  */
 
 import java.nio.ByteBuffer;

--- a/jdk/test/java/nio/file/WatchService/FileTreeModifier.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/nio/file/WatchService/FileTreeModifier.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,7 @@
  * @bug 4313887 6838333
  * @summary Sanity test for Sun-specific FILE_TREE watch event modifier
  * @library ..
+ * @modules java.base/com.sun.nio.file
  */
 
 import java.nio.file.*;

--- a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4313887
  * @summary Sanity test for Sun-specific sensitivity level watch event modifier
+ * @modules java.base/com.sun.nio.file
  * @library ..
  * @run main/timeout=240 SensitivityModifier
  * @key randomness

--- a/jdk/test/java/nio/file/WatchService/WithSecurityManager.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/nio/file/WatchService/WithSecurityManager.java	Thu May 28 10:54:48 2015 -0700
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4313887
  * @summary Unit test for Watchable#register's permission checks
+ * @modules java.base/com.sun.nio.file
  * @build WithSecurityManager
  * @run main/othervm WithSecurityManager denyAll.policy - fail
  * @run main/othervm WithSecurityManager denyAll.policy tree fail

--- a/jdk/test/java/rmi/Naming/DefaultRegistryPort.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/Naming/DefaultRegistryPort.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @summary change in default URL port causes regression in java.rmi.Naming
  * @author Dana Burns
  * @library ../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm DefaultRegistryPort
  */

--- a/jdk/test/java/rmi/Naming/LookupIPv6.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/Naming/LookupIPv6.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,10 @@
  *          IPv6 addresses.
  * @bug 4402708
  * @library ../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm -Djava.net.preferIPv6Addresses=true LookupIPv6
  */

--- a/jdk/test/java/rmi/Naming/LookupNameWithColon.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/Naming/LookupNameWithColon.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  *          containing embedded ':' characters.
  *
  * @library ../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm LookupNameWithColon
  */

--- a/jdk/test/java/rmi/Naming/RmiIsNoScheme.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/Naming/RmiIsNoScheme.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Ann Wollrath
  *
  * @library ../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm RmiIsNoScheme
  */

--- a/jdk/test/java/rmi/Naming/UnderscoreHost.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/Naming/UnderscoreHost.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
   * @author Vinod Johnson
   *
   * @library ../testlibrary
+  * @modules java.rmi/sun.rmi.registry
+  *          java.rmi/sun.rmi.server
+  *          java.rmi/sun.rmi.transport
+  *          java.rmi/sun.rmi.transport.tcp
   * @build TestLibrary UnderscoreHost_Stub
   * @run main/othervm UnderscoreHost
  */

--- a/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @summary Naming assumes '/' is present in relative URL; change in URL causes regression
  * @author Dana Burns
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Legal LegalRegistryNames_Stub
  * @run main/othervm LegalRegistryNames
  */

--- a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java	Thu May 28 10:54:48 2015 -0700
@@ -36,6 +36,10 @@
  *          functionality is in place
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivateMe CheckActivateRef_Stub
  * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=true CheckActivateRef
  * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=false CheckActivateRef

--- a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Laird Dornin; code borrowed from Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID MyRMI CheckAnnotations_Stub
  * @run main/othervm/policy=security.policy/timeout=480 CheckAnnotations
  */

--- a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Laird Dornin; code borrowed from Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID
  *     MyRMI ActivatableImpl ActivatableImpl ActivatableImpl_Stub
  * @run main/othervm/policy=security.policy/timeout=150 CheckImplClassLoader

--- a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     ActivateMe CheckRegisterInLog_Stub
  * @run main/othervm/policy=security.policy/timeout=240 CheckRegisterInLog

--- a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Laird Dornin
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivateMe
  * @run main/othervm/policy=security.policy/timeout=240 CreatePrivateActivatable
  */

--- a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java	Thu May 28 10:54:48 2015 -0700
@@ -31,6 +31,10 @@
  * @author Peter Jones (much code taken from Ann Wollrath's activation tests)
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     Foo FooReceiverImpl FooReceiverImpl_Stub Bar
  * @run main/othervm/policy=security.policy/timeout=240 DownloadParameterClass

--- a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Laird Dornin
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivateMe ElucidateNoSuchMethod_Stub
  * @run main/othervm/policy=security.policy/timeout=240 ElucidateNoSuchMethod
  */

--- a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Laird Dornin
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     ActivateMe ForceLogSnapshot_Stub
  * @run main/othervm/policy=security.policy/timeout=640 ForceLogSnapshot

--- a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary ActivateMe InactiveGroup_Stub
  * @run main/othervm/policy=security.policy/timeout=240 InactiveGroup
  */

--- a/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  * @run main/othervm/timeout=240 LookupActivationSystem
  */

--- a/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary ActivateMe NestedActivate_Stub
  * @run main/othervm/policy=security.policy/timeout=240 NestedActivate
  */

--- a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     ActivateMe NonExistentActivatable_Stub
  * @run main/othervm/policy=security.policy/timeout=240 NonExistentActivatable

--- a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivateMe RestartCrashedService_Stub
  * @run main/othervm/policy=security.policy/timeout=240 RestartCrashedService
  */

--- a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     RestartLatecomer RestartLatecomer_Stub
  * @run main/othervm/policy=security.policy/timeout=240 RestartLatecomer

--- a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary ActivateMe RestartService_Stub
  * @run main/othervm/policy=security.policy/timeout=240 RestartService
  */

--- a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Laird Dornin; code borrowed from Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID
  *     TestSecurityManager RegisteringActivatable ShutdownGracefully_Stub
  * @run main/othervm/policy=security.policy/timeout=700 ShutdownGracefully

--- a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary ActivateMe UnregisterInactive_Stub
  * @run main/othervm/policy=security.policy/timeout=240 UnregisterInactive
  */

--- a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java	Thu May 28 10:54:48 2015 -0700
@@ -31,6 +31,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     ActivateMe ActivateFails_Stub ShutdownThread
  * @run main/othervm/java.security.policy=security.policy/timeout=240 ActivateFails

--- a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java	Thu May 28 10:54:48 2015 -0700
@@ -32,6 +32,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     DownloadActivationGroup MyActivationGroupImpl DownloadActivationGroup_Stub
  * @run main/othervm/policy=security.policy/timeout=240 DownloadActivationGroup

--- a/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java	Thu May 28 10:54:48 2015 -0700
@@ -30,6 +30,10 @@
  * @author Laird Dornin
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main CheckDefaultGroupName
  */

--- a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  * @run main/othervm/policy=security.policy/timeout=480 IdempotentActiveGroup
  */

--- a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     ActivateMe ModifyDescriptor_Stub
  * @run main/othervm/policy=security.policy/timeout=240 ModifyDescriptor

--- a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,11 @@
  * @author Laird Dornin
  *
  * @library ../../../testlibrary
+ * @modules java.base/sun.security.provider
+ *          java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     CanCreateStubs StubClassesPermitted_Stub
  * @run main/othervm/java.security.policy=security.policy/secure=java.lang.SecurityManager/timeout=240 StubClassesPermitted

--- a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary ActivateMe
  * @run main/othervm/policy=security.policy UnregisterGroup
  */

--- a/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java	Thu May 28 10:54:48 2015 -0700
@@ -35,6 +35,10 @@
  * @author Adrian Colley
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  *     Eliza Retireable Doctor Doctor_Stub
  * @run main/othervm/timeout=240/policy=security.policy

--- a/jdk/test/java/rmi/activation/log/LogTest.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/log/LogTest.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,7 @@
  * boundaries
  * @author Ann Wollrath
  *
+ * @modules java.rmi/sun.rmi.log
  * @run main/othervm/timeout=240 LogTest
  */
 

--- a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,11 @@
  * @author Peter Jones
  *
  * @library ../../testlibrary
+ * @modules java.base/sun.nio.ch
+ *          java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  * @run main/othervm/timeout=240 InheritedChannelNotServerSocket
  */

--- a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,11 @@
  * @author Ann Wollrath
  *
  * @library ../../testlibrary
+ * @modules java.base/sun.nio.ch
+ *          java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary RMID ActivationLibrary
  * @run main/othervm/timeout=240 RmidViaInheritedChannel
  */

--- a/jdk/test/java/rmi/dgc/VMID/CheckVMID.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/dgc/VMID/CheckVMID.java	Thu May 28 10:54:48 2015 -0700
@@ -30,6 +30,10 @@
  * @author Ann Wollrath
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm/policy=security.policy CheckVMID
  */

--- a/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java	Thu May 28 10:54:48 2015 -0700
@@ -31,6 +31,10 @@
  * @author Peter Jones
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary DGCImplInsulation_Stub
  * @run main/othervm/policy=security.policy DGCImplInsulation
  */

--- a/jdk/test/java/rmi/invalidName/InvalidName.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/invalidName/InvalidName.java	Thu May 28 10:54:48 2015 -0700
@@ -32,6 +32,10 @@
  * @author Laird Dornin
  *
  * @library ../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm InvalidName
  */

--- a/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Laird Dornin
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary JavaVM RMID TestSecurityManager
  * @run main/othervm AltSecurityManager
  */

--- a/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java	Thu May 28 10:54:48 2015 -0700
@@ -30,6 +30,10 @@
  * @author Peter Jones
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Dummy
  * @run main/othervm/policy=security.policy
  *     -Djava.rmi.server.useCodebaseOnly=false ClassPathCodebase

--- a/jdk/test/java/rmi/registry/emptyName/EmptyName.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/registry/emptyName/EmptyName.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,10 @@
  * @bug 4399304
  * @summary check that registry allows empty names
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm EmptyName
  */

--- a/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java	Thu May 28 10:54:48 2015 -0700
@@ -36,6 +36,10 @@
  *
  * @author Peter Jones
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary ReferenceRegistryStub
  * @run main/othervm InterfaceHash
  * @key intermittent

--- a/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java	Thu May 28 10:54:48 2015 -0700
@@ -27,6 +27,10 @@
  * @author Ann Wollrath
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm/timeout=240 MultipleRegistries
  */

--- a/jdk/test/java/rmi/registry/reexport/Reexport.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/registry/reexport/Reexport.java	Thu May 28 10:54:48 2015 -0700
@@ -25,6 +25,10 @@
  * @bug 4120329
  * @summary RMI registry creation is impossible if first attempt fails.
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary JavaVM RegistryRunner RegistryRunner_Stub
  * @run main/othervm Reexport
  */

--- a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java	Thu May 28 10:54:48 2015 -0700
@@ -26,6 +26,11 @@
  * @summary The RMI benchmark test. This java class is used to run the test
  *          under JTREG.
  * @library ../../../../testlibrary ../../
+ * @modules java.desktop
+ *          java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary bench.BenchInfo bench.HtmlReporter bench.Util
  * bench.Benchmark bench.Reporter bench.XmlReporter bench.ConfigFormatException
  * bench.Harness bench.TextReporter bench.rmi.BenchServer

--- a/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java	Thu May 28 10:54:48 2015 -0700
@@ -55,6 +55,10 @@
  * has been reached.
  *
  * @library ../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  *     Apple AppleEvent AppleImpl
  *     Orange OrangeEcho OrangeEchoImpl OrangeImpl

--- a/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java	Thu May 28 10:54:48 2015 -0700
@@ -33,6 +33,10 @@
  * @author Peter Jones
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Foo
  * @run main/othervm DelegateBeforePermissionCheck
  */

--- a/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Peter Jones
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Dummy
  * @run main/othervm/policy=security.policy/timeout=120 DelegateToContextLoader
  */

--- a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java	Thu May 28 10:54:48 2015 -0700
@@ -31,6 +31,10 @@
  * @author Peter Jones
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Receiver DownloadArrayClass_Stub Foo
  * @run main/othervm/policy=security.policy DownloadArrayClass
  */

--- a/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java	Thu May 28 10:54:48 2015 -0700
@@ -28,6 +28,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary
  * @run main/othervm NullClass
  */

--- a/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java	Thu May 28 10:54:48 2015 -0700
@@ -29,6 +29,10 @@
  * @author Ann Wollrath
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary Foo
  * @run main/othervm/policy=security.policy GetClassLoader
  */

--- a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java	Thu May 28 11:31:40 2015 -0700
+++ b/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java	Thu May 28 10:54:48 2015 -0700
@@ -30,6 +30,10 @@
  * @author Laird Dornin
  *
  * @library ../../../testlibrary
+ * @modules java.rmi/sun.rmi.registry
+ *          java.rmi/sun.rmi.server
+ *          java.rmi/sun.rmi.transport
+ *          java.rmi/sun.rmi.transport.tcp
  * @build TestLibrary FnnClass FnnUnmarshal NonpublicInterface
  *     NonpublicInterface1 PublicInterface PublicInterface1
  * @run main/othervm/policy=security.policy