--- a/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	Wed May 25 03:06:24 2016 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 
 # @test
 # @bug 4763315
+# @modules java.naming
 # @build CanonicalName Lookup
 # @run shell/timeout=120 cname.sh
 # @summary Test DNS provider's handling of CNAME records

--- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 4333920
+ * @modules jdk.httpserver
  * @run main ChunkedEncodingTest
  * @summary ChunkedEncodingTest unit test
  */

--- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4333920 4994372
  * @summary ChunkedEncoding unit test; MeteredStream/ProgressData problem
  * @modules java.base/sun.net
+ *          jdk.httpserver
  * @run main ChunkedEncodingWithProgressMonitorTest
  */
 

--- a/jdk/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6446990
+ * @modules jdk.httpserver
  * @run main/othervm TestAvailable
  * @summary HttpURLConnection#available() reads more and more data into memory
  */

--- a/jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/ChunkedOutputStream/Test.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 5026745 6631048
+ * @modules jdk.httpserver
  * @run main/othervm/timeout=500 Test
  * @summary Cannot flush output stream when writing to an HttpUrlConnection
  */

--- a/jdk/test/sun/net/www/http/HttpClient/B7025238.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/HttpClient/B7025238.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 /*
  * @test
  * @bug 7025238
+ * @modules jdk.httpserver
  * @summary HttpURLConnection does not handle URLs with an empty path component
  */
 public class B7025238 {

--- a/jdk/test/sun/net/www/http/HttpURLConnection/DigestAuth.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/HttpURLConnection/DigestAuth.java	Wed May 25 03:06:24 2016 +0100
@@ -41,6 +41,7 @@
  * @summary Tests for HTTP Digest auth
  *          The impl maintains a cache for auth info,
  *          the testcases run in a separate JVM to avoid cache hits
+ * @modules jdk.httpserver
  * @run main/othervm DigestAuth good
  * @run main/othervm DigestAuth only_nonce
  * @run main/othervm DigestAuth sha1

--- a/jdk/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/HttpURLConnection/NTLMAuthWithSM.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
  * @test
  * @bug 8137174
  * @modules java.base/sun.net.www.protocol.http.ntlm
+ *          jdk.httpserver
  * @summary Checks if NTLM auth works fine if security manager set
  * @run main/othervm/java.security.policy=NTLMAuthWithSM.policy NTLMAuthWithSM
  */

--- a/jdk/test/sun/net/www/http/HttpURLConnection/PostOnDelete.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/http/HttpURLConnection/PostOnDelete.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 /*
  * @test
  * @bug 7157360
+ * @modules jdk.httpserver
  * @summary HttpURLConnection: HTTP method DELETE doesn't support output
  */
 public class PostOnDelete {

--- a/jdk/test/sun/net/www/protocol/http/6550798/test.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/6550798/test.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6550798
  * @summary Using InputStream.skip with ResponseCache will cause partial data to be cached
+ * @modules jdk.httpserver
  * @run main/othervm test
  */
 

--- a/jdk/test/sun/net/www/protocol/http/AsyncDisconnect.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/AsyncDisconnect.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6358532
+ * @modules jdk.httpserver
  * @run main/othervm AsyncDisconnect
  * @summary HttpURLConnection.disconnect doesn't really do the job
  */

--- a/jdk/test/sun/net/www/protocol/http/B5017051.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B5017051.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 5017051 6360774
+ * @modules jdk.httpserver
  * @run main/othervm B5017051
  * @summary Tests CR 5017051 & 6360774
  */

--- a/jdk/test/sun/net/www/protocol/http/B6299712.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B6299712.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6299712 7150552
+ * @modules jdk.httpserver
  * @run main/othervm B6299712
  * @summary  NullPointerException in sun.net.www.protocol.http.HttpURLConnection.followRedirect
  */

--- a/jdk/test/sun/net/www/protocol/http/B6369510.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B6369510.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6369510
+ * @modules jdk.httpserver
  * @run main/othervm B6369510
  * @summary HttpURLConnection sets Content-Type to application/x-www-form-urlencoded
  */

--- a/jdk/test/sun/net/www/protocol/http/B6518816.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B6518816.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6518816
+ * @modules jdk.httpserver
  * @run main/othervm B6518816
  */
 

--- a/jdk/test/sun/net/www/protocol/http/B6641309.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B6641309.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6641309
+ * @modules jdk.httpserver
  * @summary Wrong Cookie separator used in HttpURLConnection
  */
 

--- a/jdk/test/sun/net/www/protocol/http/B6660405.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B6660405.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6660405
+ * @modules jdk.httpserver
  * @summary HttpURLConnection returns the wrong InputStream
  */
 

--- a/jdk/test/sun/net/www/protocol/http/B8012625.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/B8012625.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8012625
+ * @modules jdk.httpserver
  * @run main B8012625
  */
 

--- a/jdk/test/sun/net/www/protocol/http/BasicLongCredentials.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/BasicLongCredentials.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 6947917
+ * @modules jdk.httpserver
  * @summary  Error in basic authentication when user name and password are long
  */
 

--- a/jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/ChunkedErrorStream.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6488669 6595324 6993490
+ * @modules jdk.httpserver
  * @run main/othervm ChunkedErrorStream
  * @summary Chunked ErrorStream tests
  */

--- a/jdk/test/sun/net/www/protocol/http/HttpOnly.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/HttpOnly.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 /**
  * @test
  * @bug 7095980 8007315
+ * @modules jdk.httpserver
  * @summary Ensure HttpURLConnection (and supporting APIs) don't expose
  *          HttpOnly cookies
  */

--- a/jdk/test/sun/net/www/protocol/http/HttpStreams.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/HttpStreams.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8011719
+ * @modules jdk.httpserver
  * @summary Basic checks to verify behavior of returned input streams
  */
 

--- a/jdk/test/sun/net/www/protocol/http/NoCache.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/NoCache.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 7133367
+ * @modules jdk.httpserver
  * @summary ResponseCache.put should not be called when setUseCaches(false)
  */
 

--- a/jdk/test/sun/net/www/protocol/http/RedirectOnPost.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/RedirectOnPost.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @library /lib/testlibrary/
+ * @modules jdk.httpserver
  * @build jdk.testlibrary.SimpleSSLContext
  * @compile RedirectOnPost.java
  * @run main/othervm RedirectOnPost

--- a/jdk/test/sun/net/www/protocol/http/StreamingOutputStream.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/StreamingOutputStream.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6472250
+ * @modules jdk.httpserver
  * @run main/othervm StreamingOutputStream
  * @summary HttpURLConnection.getOutputStream streaming mode bug when called multiple times
  */

--- a/jdk/test/sun/net/www/protocol/http/UserAuth.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/UserAuth.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6421122
+ * @modules jdk.httpserver
  * @run main/othervm UserAuth
  * @summary Authorization header removed for preemptive authentication by user code
  */

--- a/jdk/test/sun/net/www/protocol/http/UserCookie.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/UserCookie.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6439651
+ * @modules jdk.httpserver
  * @run main/othervm UserAuth
  * @summary Sending "Cookie" header with JRE 1.5.0_07 doesn't work anymore
  */

--- a/jdk/test/sun/net/www/protocol/http/ZoneId.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/http/ZoneId.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8027308
  * @key intermittent
  * @modules java.base/sun.net.www.protocol.http
+ *          jdk.httpserver
  * @summary  verifies that HttpURLConnection does not send the zone id in the
  *           'Host' field of the header:
  *              Host: [fe80::a00:27ff:aaaa:aaaa] instead of

--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6771432
  * @summary createSocket() - smpatch fails using 1.6.0_10 because of
  *     "Unconnected sockets not implemented"
+ * @modules jdk.httpserver
  * @run main/othervm HttpsCreateSockTest
  *
  *     SunJSSE does not support dynamic system properties, no way to re-use

--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6614957
  * @summary HttpsURLConnection not using the set SSLSocketFactory for creating all its Sockets
+ * @modules jdk.httpserver
  * @run main/othervm HttpsSocketFacTest
  *
  *     SunJSSE does not support dynamic system properties, no way to re-use

--- a/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java	Wed May 25 03:06:24 2016 +0100
@@ -26,6 +26,9 @@
  * @bug 8132734 8144062
  * @summary Test that URL connections to multi-release jars can be runtime versioned
  * @library /lib/testlibrary/java/util/jar
+ * @modules java.compiler
+ *          jdk.httpserver
+ *          jdk.jartool
  * @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer
  * @run testng MultiReleaseJarURLConnection
  */

--- a/jdk/test/sun/nio/ch/TestMaxCachedBufferSize.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/nio/ch/TestMaxCachedBufferSize.java	Wed May 25 03:06:24 2016 +0100
@@ -43,6 +43,7 @@
 /*
  * @test
  * @requires sun.arch.data.model == "64"
+ * @modules java.management
  * @build TestMaxCachedBufferSize
  * @run main/othervm TestMaxCachedBufferSize
  * @run main/othervm -Djdk.nio.maxCachedBufferSize=0 TestMaxCachedBufferSize

--- a/jdk/test/sun/security/provider/PolicyFile/Modules.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/security/provider/PolicyFile/Modules.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,19 @@
  * @test
  * @bug 8047771
  * @summary check permissions and principals from various modules
+ * @modules java.desktop
+ *          java.logging
+ *          java.management
+ *          java.security.jgss
+ *          java.smartcardio
+ *          java.sql
+ *          java.xml
+ *          java.xml.bind
+ *          jdk.attach
+ *          jdk.jdi
+ *          jdk.net
+ *          jdk.security.auth
+ *          jdk.security.jgss
  * @compile -addmods java.xml.ws,java.smartcardio Modules.java
  * @run main/othervm/java.security.policy==modules.policy
  *     -addmods java.xml.ws,java.smartcardio Modules

--- a/jdk/test/sun/util/logging/SourceClassName.java	Wed May 25 02:47:28 2016 +0100
+++ b/jdk/test/sun/util/logging/SourceClassName.java	Wed May 25 03:06:24 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *          logger.
  *
  * @modules java.base/sun.util.logging
+ *          java.logging
  * @compile -XDignore.symbol.file SourceClassName.java
  * @run main/othervm SourceClassName
  */