--- a/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java	Tue Sep 20 08:46:33 2016 +0200
+++ b/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java	Tue Sep 20 12:56:54 2016 +0300
@@ -27,6 +27,7 @@
  * @summary Test two URLClassLoader define Package object of the same name
  * @library /lib/testlibrary
  * @build CompilerUtils
+ * @modules jdk.compiler
  * @run testng SplitPackage
  */
 

--- a/jdk/test/java/net/httpclient/HeadersTest1.java	Tue Sep 20 08:46:33 2016 +0200
+++ b/jdk/test/java/net/httpclient/HeadersTest1.java	Tue Sep 20 12:56:54 2016 +0300
@@ -23,9 +23,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8153142
+ * @modules java.httpclient
+ *          jdk.httpserver
  * @run main/othervm HeadersTest1
  * @summary HeadersTest1
  */
@@ -39,9 +41,11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
-import java.net.PasswordAuthentication;
 import java.net.URI;
-import java.net.http.*;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpResponse;
+import java.net.http.HttpRequest;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.List;

--- a/jdk/test/java/net/httpclient/ProxyAuthTest.java	Tue Sep 20 08:46:33 2016 +0200
+++ b/jdk/test/java/net/httpclient/ProxyAuthTest.java	Tue Sep 20 12:56:54 2016 +0300
@@ -26,6 +26,7 @@
  * @test
  * @bug 8163561
  * @modules java.base/sun.net.www
+ *          java.httpclient
  * @summary Verify that Proxy-Authenticate header is correctly handled
  *
  * @run main/othervm ProxyAuthTest

--- a/jdk/test/java/net/httpclient/whitebox/Driver.java	Tue Sep 20 08:46:33 2016 +0200
+++ b/jdk/test/java/net/httpclient/whitebox/Driver.java	Tue Sep 20 12:56:54 2016 +0300
@@ -24,5 +24,6 @@
 /*
  * @test
  * @bug 8151299
+ * @modules java.httpclient
  * @run testng java.httpclient/java.net.http.SelectorTest
  */