--- a/test/jdk/java/lang/ProcessHandle/OnExitTest.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/java/lang/ProcessHandle/OnExitTest.java	Fri Mar 16 03:15:35 2018 -0700
@@ -41,6 +41,7 @@
 /*
  * @test
  * @library /test/lib
+ * @modules jdk.management
  * @build jdk.test.lib.Utils
  * @run testng OnExitTest
  * @summary Functions of Process.onExit and ProcessHandle.onExit

--- a/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java	Fri Mar 16 03:15:35 2018 -0700
@@ -26,6 +26,7 @@
  * @library /lib/testlibrary /test/lib
  * @modules java.base/jdk.internal.module
  *          jdk.compiler
+ *          jdk.jlink
  * @build ModuleReaderTest jdk.test.lib.compiler.CompilerUtils JarUtils
  * @run testng ModuleReaderTest
  * @summary Basic tests for java.lang.module.ModuleReader

--- a/test/jdk/java/util/ServiceLoader/ReloadTest.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/java/util/ServiceLoader/ReloadTest.java	Fri Mar 16 03:15:35 2018 -0700
@@ -24,7 +24,7 @@
 /**
  * @test
  * @library modules
- * @modules java.scripting
+ * @modules jdk.scripting.nashorn
  * @run testng/othervm ReloadTest
  * @summary Basic test of ServiceLoader.reload
  */

--- a/test/jdk/java/util/zip/ZipFile/ReadZip.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/java/util/zip/ZipFile/ReadZip.java	Fri Mar 16 03:15:35 2018 -0700
@@ -25,6 +25,7 @@
    @bug 4241361 4842702 4985614 6646605 5032358 6923692 6233323 8144977 8186464
    @summary Make sure we can read a zip file.
    @key randomness
+   @modules jdk.zipfs
  */
 
 import java.io.*;

--- a/test/jdk/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java	Fri Mar 16 03:15:35 2018 -0700
@@ -25,6 +25,8 @@
  * @test
  * @library /lib/testlibrary /test/lib
  * @modules jdk.compiler
+ *          java.scripting
+ *          jdk.zipfs
  * @build RunWithAutomaticModules jdk.test.lib.compiler.CompilerUtils JarUtils
  *        jdk.testlibrary.ProcessTools
  * @run testng RunWithAutomaticModules

--- a/test/jdk/sun/misc/JarIndex/metaInfFilenames/Basic.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/sun/misc/JarIndex/metaInfFilenames/Basic.java	Fri Mar 16 03:15:35 2018 -0700
@@ -28,6 +28,7 @@
  * @modules jdk.jartool/sun.tools.jar
  *          jdk.httpserver
  *          jdk.compiler
+ *          jdk.zipfs
  * @run main/othervm Basic
  */
 

--- a/test/jdk/sun/misc/URLClassPath/ClassnameCharTest.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/sun/misc/URLClassPath/ClassnameCharTest.java	Fri Mar 16 03:15:35 2018 -0700
@@ -26,6 +26,7 @@
  * @summary cannot load class names containing some JSR 202 characters;
  *          plugin does not escape unicode character in http request
  * @modules java.desktop/sun.applet
+ *          jdk.httpserver
  * @compile -XDignore.symbol.file=true ClassnameCharTest.java
  * @run main ClassnameCharTest
  */

--- a/test/jdk/tools/pack200/Pack200Props.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/tools/pack200/Pack200Props.java	Fri Mar 16 03:15:35 2018 -0700
@@ -25,7 +25,8 @@
  * @test
  * @bug 6575373 6969063
  * @summary verify default properties of the packer/unpacker and segment limit
- * @modules jdk.compiler
+ * @modules java.logging
+ *          jdk.compiler
  *          jdk.zipfs
  * @compile -XDignore.symbol.file Utils.java Pack200Props.java
  * @run main Pack200Props

--- a/test/jdk/tools/pack200/Pack200Test.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/tools/pack200/Pack200Test.java	Fri Mar 16 03:15:35 2018 -0700
@@ -27,6 +27,8 @@
   * @requires (sun.arch.data.model == "64" & os.maxMemory >= 4g)
   * @summary test general packer/unpacker functionality
   *          using native and java unpackers
+  * @modules jdk.management
+  *          jdk.zipfs
   * @compile -XDignore.symbol.file Utils.java Pack200Test.java
   * @run main/othervm/timeout=1200 -Xmx1280m -Xshare:off Pack200Test
   */

--- a/test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java	Mon Feb 26 12:43:53 2018 +0100
+++ b/test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java	Fri Mar 16 03:15:35 2018 -0700
@@ -26,6 +26,7 @@
  * @bug 8003639
  * @summary defaultMethod resolution and verification using an URLClassLoader
  * @modules jdk.compiler
+ *          jdk.zipfs
  * @compile -XDignore.symbol.file=true DefaultMethodRegressionTestsRun.java
  * @run main DefaultMethodRegressionTestsRun
  */