--- a/jdk/test/jdk/net/SocketFlow/SocketFlowBasic.java	Thu May 26 14:44:42 2016 -0700
+++ b/jdk/test/jdk/net/SocketFlow/SocketFlowBasic.java	Thu May 26 15:47:39 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8765432
  * @summary Basic test for SocketFlow API
+ * @modules jdk.net
  * @run testng SocketFlowBasic
  */
 

--- a/jdk/test/jdk/net/Sockets/SupportedOptions.java	Thu May 26 14:44:42 2016 -0700
+++ b/jdk/test/jdk/net/Sockets/SupportedOptions.java	Thu May 26 15:47:39 2016 -0700
@@ -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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8062744
+ * @modules jdk.net
  * @run main SupportedOptions
  */
 

--- a/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java	Thu May 26 14:44:42 2016 -0700
+++ b/jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java	Thu May 26 15:47:39 2016 -0700
@@ -28,7 +28,9 @@
  * @library /lib/testlibrary/java/util/jar
  * @build Compiler JarBuilder CreateMultiReleaseTestJars
  * @run testng MultiReleaseJarTest
- * @modules jdk.zipfs
+ * @modules java.compiler
+ *          jdk.jartool
+ *          jdk.zipfs
  */
 
 import java.io.IOException;