--- old/test/com/oracle/security/ucrypto/TestCICOWithGCM.java	2016-01-24 14:06:44.000000000 +0000
+++ new/test/com/oracle/security/ucrypto/TestCICOWithGCM.java	2016-01-24 14:06:44.000000000 +0000
@@ -34,7 +34,6 @@
 import javax.crypto.spec.*;
 import java.math.*;
 import java.io.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/oracle/security/ucrypto/TestGCMKeyAndIvCheck.java	2016-01-24 14:06:45.000000000 +0000
+++ new/test/com/oracle/security/ucrypto/TestGCMKeyAndIvCheck.java	2016-01-24 14:06:45.000000000 +0000
@@ -32,7 +32,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.math.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/oracle/security/ucrypto/TestGCMWithSBE.java	2016-01-24 14:06:46.000000000 +0000
+++ new/test/com/oracle/security/ucrypto/TestGCMWithSBE.java	2016-01-24 14:06:46.000000000 +0000
@@ -32,7 +32,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.math.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java	2016-01-24 14:06:47.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java	2016-01-24 14:06:47.000000000 +0000
@@ -37,7 +37,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.security.Provider;
-import com.sun.crypto.provider.*;
 
 public class Test4513830 {
 
--- old/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCM.java	2016-01-24 14:06:49.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCM.java	2016-01-24 14:06:48.000000000 +0000
@@ -37,7 +37,6 @@
 import javax.crypto.spec.*;
 import java.math.*;
 import java.io.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/sun/crypto/provider/Cipher/AES/TestGCMKeyAndIvCheck.java	2016-01-24 14:06:50.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestGCMKeyAndIvCheck.java	2016-01-24 14:06:50.000000000 +0000
@@ -36,7 +36,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.math.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java	2016-01-24 14:06:51.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestGHASH.java	2016-01-24 14:06:51.000000000 +0000
@@ -25,6 +25,7 @@
 /*
  * @test
  * @bug 8069072
+ * @modules java.base/com.sun.crypto.provider
  * @summary Test vectors for com.sun.crypto.provider.GHASH.
  *
  * Single iteration to verify software-only GHASH algorithm.
--- old/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java	2016-01-24 14:06:52.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java	2016-01-24 14:06:52.000000000 +0000
@@ -35,7 +35,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.security.Provider;
-import com.sun.crypto.provider.*;
 
 public class TestISO10126Padding {
     private static final String ALGO = "AES";
--- old/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java	2016-01-24 14:06:53.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java	2016-01-24 14:06:53.000000000 +0000
@@ -34,7 +34,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.math.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/sun/crypto/provider/Cipher/AES/TestKATForGCM.java	2016-01-24 14:06:54.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestKATForGCM.java	2016-01-24 14:06:54.000000000 +0000
@@ -37,7 +37,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.math.*;
-import com.sun.crypto.provider.*;
 
 import java.util.*;
 
--- old/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java	2016-01-24 14:06:56.000000000 +0000
+++ new/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java	2016-01-24 14:06:56.000000000 +0000
@@ -35,7 +35,6 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 import java.security.Provider;
-import com.sun.crypto.provider.*;
 
 public class TestShortBuffer {
     private static final String ALGO = "AES";
--- old/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java	2016-01-24 14:06:58.000000000 +0000
+++ new/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java	2016-01-24 14:06:57.000000000 +0000
@@ -33,7 +33,7 @@
  *          with a lower-case letter
  *
  * @author Jaroslav Bachorik
- * @modules java.management
+ * @modules java.management/com.sun.jmx.mbeanserver
  * @run clean SimpleIntrospectorTest
  * @run build SimpleIntrospectorTest BeanClass
  * @run main SimpleIntrospectorTest
--- old/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java	2016-01-24 14:06:59.000000000 +0000
+++ new/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java	2016-01-24 14:06:59.000000000 +0000
@@ -27,7 +27,8 @@
  * @summary Check that GarbageCollectionNotification contents are reasonable
  * @author  Frederic Parain
  * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false
- * @modules jdk.management
+ * @modules java.management/sun.management
+ *          jdk.management
  * @run     main/othervm GarbageCollectionNotificationContentTest
  */
 
--- old/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java	2016-01-24 14:07:01.000000000 +0000
+++ new/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java	2016-01-24 14:07:00.000000000 +0000
@@ -27,7 +27,8 @@
  * @summary Check that GarbageCollection notification are thrown by every GarbageCollectorMXBean
  * @author  Frederic Parain
  * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false
- * @modules jdk.management
+ * @modules java.management/sun.management
+ *          jdk.management
  * @run     main/othervm GarbageCollectionNotificationTest
  */
 
--- old/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java	2016-01-24 14:07:02.000000000 +0000
+++ new/test/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerAPIsTest.java	2016-01-24 14:07:02.000000000 +0000
@@ -40,6 +40,7 @@
  * @summary Cover the logXX and LogEvent.valueOf APIs of BootstrapLogger
  *          and logXX APIs of SimpleConsoleLogger.
  * @modules java.base/jdk.internal.logger
+ *          java.base/sun.util.logging
  * @build BootstrapLoggerUtils LogStream
  * @run main/othervm BootstrapLoggerAPIsTest
  */
--- old/test/java/lang/invoke/AccessControlTest.java	2016-01-24 14:07:03.000000000 +0000
+++ new/test/java/lang/invoke/AccessControlTest.java	2016-01-24 14:07:03.000000000 +0000
@@ -23,9 +23,7 @@
 
 /* @test
  * @summary test access checking by java.lang.invoke.MethodHandles.Lookup
- * @library ../../../..
- * @build test.java.lang.invoke.AccessControlTest
- * @build test.java.lang.invoke.AccessControlTest_subpkg.Acquaintance_remote
+ * @compile AccessControlTest.java AccessControlTest_subpkg/Acquaintance_remote.java
  * @run testng/othervm test.java.lang.invoke.AccessControlTest
  */
 
--- old/test/java/lang/invoke/ExplicitCastArgumentsTest.java	2016-01-24 14:07:05.000000000 +0000
+++ new/test/java/lang/invoke/ExplicitCastArgumentsTest.java	2016-01-24 14:07:04.000000000 +0000
@@ -38,6 +38,7 @@
  * @bug 8060483 8066746
  * @key randomness
  * @library /lib/testlibrary /lib/testlibrary/jsr292
+ * @modules java.base/sun.invoke.util
  * @summary unit tests for MethodHandles.explicitCastArguments()
  * @run main ExplicitCastArgumentsTest
  */
--- old/test/java/lang/invoke/lambda/LambdaAsm.java	2016-01-24 14:07:06.000000000 +0000
+++ new/test/java/lang/invoke/lambda/LambdaAsm.java	2016-01-24 14:07:05.000000000 +0000
@@ -27,7 +27,7 @@
  * @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
+ *          jdk.jdeps/com.sun.tools.classfile
  * @compile -XDignore.symbol.file LambdaAsm.java LUtils.java
  * @run main/othervm LambdaAsm
  */
--- old/test/java/nio/channels/SocketChannel/VectorIO.java	2016-01-24 14:07:07.000000000 +0000
+++ new/test/java/nio/channels/SocketChannel/VectorIO.java	2016-01-24 14:07:06.000000000 +0000
@@ -32,7 +32,6 @@
 import java.nio.*;
 import java.nio.channels.*;
 import java.util.*;
-import sun.misc.*;
 
 
 public class VectorIO {
--- old/test/java/nio/channels/SocketChannel/Write.java	2016-01-24 14:07:08.000000000 +0000
+++ new/test/java/nio/channels/SocketChannel/Write.java	2016-01-24 14:07:08.000000000 +0000
@@ -32,7 +32,6 @@
 import java.nio.*;
 import java.nio.channels.*;
 import java.util.*;
-import sun.misc.*;
 
 
 public class Write {
--- old/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java	2016-01-24 14:07:09.000000000 +0000
+++ new/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java	2016-01-24 14:07:09.000000000 +0000
@@ -30,9 +30,6 @@
 import java.nio.channels.*;
 import java.lang.reflect.*;
 
-// dependency on Sun implementation
-import sun.nio.ch.*;
-
 public class Util {
 
     private static Object get(String className, String fieldName, Object o) throws Exception {
--- old/test/java/security/KeyStore/EntryMethods.java	2016-01-24 14:07:10.000000000 +0000
+++ new/test/java/security/KeyStore/EntryMethods.java	2016-01-24 14:07:10.000000000 +0000
@@ -32,8 +32,6 @@
 import java.util.*;
 import java.io.*;
 
-import sun.security.provider.*;
-
 public class EntryMethods
     extends Provider
     implements KeyStore.Entry
--- old/test/java/util/Locale/Bug8008577.java	2016-01-24 14:07:12.000000000 +0000
+++ new/test/java/util/Locale/Bug8008577.java	2016-01-24 14:07:11.000000000 +0000
@@ -26,6 +26,7 @@
  * @bug 8008577 8138613
  * @summary Check whether CLDR locale provider adapter is enabled by default
  * @compile -XDignore.symbol.file Bug8008577.java
+ * @modules java.base/sun.util.locale.provider
  * @run main Bug8008577
  */
 
--- old/test/java/util/PluggableLocale/BreakIteratorProviderTest.java	2016-01-24 14:07:13.000000000 +0000
+++ new/test/java/util/PluggableLocale/BreakIteratorProviderTest.java	2016-01-24 14:07:13.000000000 +0000
@@ -26,9 +26,7 @@
 
 import java.text.*;
 import java.util.*;
-import sun.text.resources.*;
 import sun.util.locale.provider.*;
-import sun.util.resources.*;
 
 public class BreakIteratorProviderTest extends ProviderTest {
 
--- old/test/javax/net/ssl/DTLS/CipherSuite.java	2016-01-24 14:07:15.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/CipherSuite.java	2016-01-24 14:07:14.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA
  * @run main/othervm CipherSuite TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
  * @run main/othervm CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA256
--- old/test/javax/net/ssl/DTLS/ClientAuth.java	2016-01-24 14:07:16.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/ClientAuth.java	2016-01-24 14:07:16.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm ClientAuth
  */
 
--- old/test/javax/net/ssl/DTLS/InvalidCookie.java	2016-01-24 14:07:17.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/InvalidCookie.java	2016-01-24 14:07:17.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm InvalidCookie
  */
 
--- old/test/javax/net/ssl/DTLS/InvalidRecords.java	2016-01-24 14:07:19.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/InvalidRecords.java	2016-01-24 14:07:18.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm InvalidRecords
  */
 
--- old/test/javax/net/ssl/DTLS/NoMacInitialClientHello.java	2016-01-24 14:07:20.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/NoMacInitialClientHello.java	2016-01-24 14:07:20.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm -Djdk.tls.client.enableStatusRequestExtension=false
  *      NoMacInitialClientHello
  */
--- old/test/javax/net/ssl/DTLS/Reordered.java	2016-01-24 14:07:21.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/Reordered.java	2016-01-24 14:07:21.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm Reordered
  */
 
--- old/test/javax/net/ssl/DTLS/Retransmission.java	2016-01-24 14:07:23.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/Retransmission.java	2016-01-24 14:07:22.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm Retransmission
  */
 
--- old/test/javax/net/ssl/DTLS/WeakCipherSuite.java	2016-01-24 14:07:24.000000000 +0000
+++ new/test/javax/net/ssl/DTLS/WeakCipherSuite.java	2016-01-24 14:07:24.000000000 +0000
@@ -28,7 +28,8 @@
  * @test
  * @bug 8043758
  * @summary Datagram Transport Layer Security (DTLS)
- * @compile DTLSOverDatagram.java
+ * @modules java.base/sun.security.util
+ * @build DTLSOverDatagram
  * @run main/othervm WeakCipherSuite TLS_DH_anon_WITH_AES_128_GCM_SHA256
  * @run main/othervm WeakCipherSuite SSL_DH_anon_WITH_DES_CBC_SHA
  * @run main/othervm WeakCipherSuite SSL_RSA_WITH_DES_CBC_SHA
--- old/test/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java	2016-01-24 14:07:26.000000000 +0000
+++ new/test/javax/xml/jaxp/PrecisionDecimalDV/XPrecisionDecimalToString.java	2016-01-24 14:07:25.000000000 +0000
@@ -31,6 +31,7 @@
  *   in com.sun.org.apache.xerces.internal.impl.dv.xs.PrecisionDecimalDV$XPrecisionDecimal.
  *   Since that method is private the test unfortunately needs to use reflection
  *   to invoke the method.
+ * @modules java.xml/com.sun.org.apache.xerces.internal.impl.dv.xs
  * @run main XPrecisionDecimalToString
  * @author Daniel Fuchs
  */
--- old/test/jdk/internal/jline/KeyConversionTest.java	2016-01-24 14:07:27.000000000 +0000
+++ new/test/jdk/internal/jline/KeyConversionTest.java	2016-01-24 14:07:27.000000000 +0000
@@ -25,6 +25,7 @@
  * @test
  * @bug 8080679
  * @summary Verify the conversion from key events to escape sequences works properly.
+ * @modules jdk.internal.le/jdk.internal.jline
  * @requires os.family == "windows"
  */
 
--- old/test/jdk/internal/jline/console/StripAnsiTest.java	2016-01-24 14:07:29.000000000 +0000
+++ new/test/jdk/internal/jline/console/StripAnsiTest.java	2016-01-24 14:07:28.000000000 +0000
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8080679
+ * @modules jdk.internal.le/jdk.internal.jline.console
  * @summary Verify ConsoleReader.stripAnsi strips escape sequences from its input correctly.
  */
 
--- old/test/sun/awt/shell/ShellFolderMemoryLeak.java	2016-01-24 14:07:30.000000000 +0000
+++ new/test/sun/awt/shell/ShellFolderMemoryLeak.java	2016-01-24 14:07:30.000000000 +0000
@@ -28,7 +28,7 @@
             after calling Win32ShellFolder:listFiles
             multiple times on some directory with
             large number of files/folders
- * @modules java.desktop/sun.awt
+ * @modules java.desktop/sun.awt.shell
  * @requires (os.family == "windows")
  * @run main/timeout=1000 ShellFolderMemoryLeak
  */
@@ -223,4 +223,4 @@
                     .log(Level.SEVERE, "Unable to delete files", ex);
         }
     }
-}
\ No newline at end of file
+}
--- old/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java	2016-01-24 14:07:31.000000000 +0000
+++ new/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java	2016-01-24 14:07:31.000000000 +0000
@@ -39,6 +39,7 @@
 /*
  * @test
  * @bug 8137174
+ * @modules java.base/sun.net.www.protocol.http.ntlm
  * @summary Checks if NTLM auth works fine if security manager set
  * @run main/othervm/java.security.policy=NTLMAuthWithSM.policy NTLMAuthWithSM
  */
--- old/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java	2016-01-24 14:07:33.000000000 +0000
+++ new/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java	2016-01-24 14:07:32.000000000 +0000
@@ -48,7 +48,7 @@
  * @bug 8010117
  * @summary Verify if CallerSensitive methods are annotated with
  *          sun.reflect.CallerSensitive annotation
- * @modules jdk.compiler/com.sun.tools.classfile jdk.jdeps/com.sun.tools.jdeps
+ * @modules jdk.jdeps/com.sun.tools.classfile jdk.jdeps/com.sun.tools.jdeps
  * @build CallerSensitiveFinder
  * @run main/othervm/timeout=900 CallerSensitiveFinder
  */
--- old/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java	2016-01-24 14:07:34.000000000 +0000
+++ new/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java	2016-01-24 14:07:34.000000000 +0000
@@ -29,7 +29,6 @@
  * @modules java.base/sun.reflect
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jdeps/com.sun.tools.jdeps
- * @modules java.base/sun.reflect
  * @compile -XDignore.symbol.file MissingCallerSensitive.java
  * @build CallerSensitiveFinder
  * @run main MissingCallerSensitive
--- old/test/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java	2016-01-24 14:07:35.000000000 +0000
+++ new/test/sun/security/provider/FileInputStreamPool/FileInputStreamPoolTest.java	2016-01-24 14:07:35.000000000 +0000
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8047769
+ * @modules java.base/sun.security.provider
  * @summary SecureRandom should be more frugal with file descriptors
  */
 
--- old/test/sun/security/provider/certpath/Extensions/OCSPNonceExtensionTests.java	2016-01-24 14:07:37.000000000 +0000
+++ new/test/sun/security/provider/certpath/Extensions/OCSPNonceExtensionTests.java	2016-01-24 14:07:36.000000000 +0000
@@ -25,6 +25,9 @@
  * @test
  * @bug 8046321
  * @summary Unit tests for OCSPNonceExtension objects
+ * @modules java.base/sun.security.provider.certpath
+ *          java.base/sun.security.util
+ *          java.base/sun.security.x509
  */
 
 import java.security.cert.Extension;
--- old/test/sun/security/provider/certpath/ResponderId/ResponderIdTests.java	2016-01-24 14:07:38.000000000 +0000
+++ new/test/sun/security/provider/certpath/ResponderId/ResponderIdTests.java	2016-01-24 14:07:37.000000000 +0000
@@ -25,6 +25,8 @@
  * @test
  * @bug 8046321
  * @summary OCSP Stapling for TLS (ResponderId tests)
+ * @modules java.base/sun.security.provider.certpath
+ *          java.base/sun.security.x509
  */
 
 import java.io.*;
--- old/test/sun/security/ssl/ExtensionType/OptimalListSize.java	2016-01-24 14:07:39.000000000 +0000
+++ new/test/sun/security/ssl/ExtensionType/OptimalListSize.java	2016-01-24 14:07:39.000000000 +0000
@@ -26,6 +26,7 @@
  * @bug 8080535
  * @summary Expected size of Character.UnicodeBlock.map is not optimal
  * @library /lib/testlibrary
+ * @modules java.base/sun.security.ssl
  * @build jdk.testlibrary.OptimalCapacity
  * @run main OptimalListSize
  */
--- old/test/sun/security/ssl/SSLSocketImpl/CheckMethods.java	2016-01-24 14:07:40.000000000 +0000
+++ new/test/sun/security/ssl/SSLSocketImpl/CheckMethods.java	2016-01-24 14:07:40.000000000 +0000
@@ -29,7 +29,6 @@
 import java.net.*;
 import java.util.*;
 import java.lang.reflect.*;
-import com.sun.net.ssl.internal.ssl.*;
 
 public class CheckMethods {
     static boolean debug = false;
--- old/test/sun/security/x509/AVA/EmailAddressEncoding.java	2016-01-24 14:07:42.000000000 +0000
+++ new/test/sun/security/x509/AVA/EmailAddressEncoding.java	2016-01-24 14:07:41.000000000 +0000
@@ -33,7 +33,6 @@
 import javax.security.auth.x500.*;
 import sun.security.util.*;
 import sun.security.pkcs.*;
-import sun.security.x509.*;
 
 public class EmailAddressEncoding {
 
--- old/test/sun/text/resources/LocaleDataTest.java	2016-01-24 14:07:43.000000000 +0000
+++ new/test/sun/text/resources/LocaleDataTest.java	2016-01-24 14:07:43.000000000 +0000
@@ -38,6 +38,7 @@
  *      7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
  * @summary Verify locale data
+ * @modules java.base/sun.util.resources
  * @run main LocaleDataTest
  * @run main LocaleDataTest -cldr
  *
--- old/test/sun/util/logging/PlatformLoggerTest.java	2016-01-24 14:07:44.000000000 +0000
+++ new/test/sun/util/logging/PlatformLoggerTest.java	2016-01-24 14:07:44.000000000 +0000
@@ -30,6 +30,7 @@
  *          is not initialized.
  *
  * @modules java.base/sun.util.logging
+ *          java.logging/sun.util.logging.internal
  * @compile -XDignore.symbol.file PlatformLoggerTest.java
  * @run main/othervm PlatformLoggerTest
  */