--- a/jdk/test/com/sun/tools/attach/BasicTests.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java	Wed Mar 22 17:57:22 2017 -0700
@@ -40,16 +40,17 @@
 /*
  * @test
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
- * @summary Basic unit tests for the VM attach mechanism.
  * @key intermittent
+ * @summary Basic unit tests for the VM attach mechanism. This test will perform
+ * a number of basic attach tests.
+ *
  * @library /lib/testlibrary
  * @modules java.instrument
- *          java.management
+ *          jdk.attach
  *          jdk.jartool/sun.tools.jar
+ *
  * @run build jdk.testlibrary.* Agent BadAgent RedefineAgent Application RedefineDummy RunnerUtil
  * @run main BasicTests
- *
- * This test will perform a number of basic attach tests.
  */
 public class BasicTests {
 

--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -27,7 +27,6 @@
  * @summary Test if proxy for PlatformLoggingMXBean is equivalent
  *          to proxy for LoggingMXBean
  *
- * @modules jdk.management
  * @build LoggingMXBeanTest
  * @run main LoggingMXBeanTest
  */

--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -24,12 +24,10 @@
 /*
  * @test
  * @bug     6876135 7024172 7067691
- *
  * @summary Test PlatformLoggingMXBean
  *          This test performs similar testing as
  *          java/util/logging/LoggingMXBeanTest.
  *
- * @modules jdk.management
  * @build PlatformLoggingMXBeanTest
  * @run main PlatformLoggingMXBeanTest
  */

--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -40,12 +40,16 @@
 /**
  * @test
  * @bug 6434402 8004926
+ * @author Jaroslav Bachorik
+ *
  * @library /lib/testlibrary
- * @modules jdk.management.agent/jdk.internal.agent
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.management.agent/jdk.internal.agent
+ *
  * @build jdk.testlibrary.*
  * @build TestManager TestApplication CustomLauncherTest
  * @run main/othervm CustomLauncherTest
- * @author Jaroslav Bachorik
  */
 public class CustomLauncherTest {
     private static final  String TEST_CLASSPATH = System.getProperty("test.class.path");

--- a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -27,7 +27,11 @@
  * @summary Tests that the jvmstat counters published by the out-of-the-box
  *          management agent for the JMX connection details are correct.
  * @author Luis-Miguel Alventosa
- * @modules jdk.management.agent/jdk.internal.agent
+ *
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.management.agent/jdk.internal.agent
+ *
  * @run clean JvmstatCountersTest
  * @run build JvmstatCountersTest
  * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 1

--- a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -32,13 +32,17 @@
 
 /**
  * @test
- * @library /lib/testlibrary
  * @bug 5016507 6173612 6319776 6342019 6484550 8004926
  * @summary Start a managed VM and test that a management tool can connect
  *          without connection or username/password details.
  *          TestManager will attempt a connection to the address obtained from
  *          both agent properties and jvmstat buffer.
- * @modules jdk.management.agent/jdk.internal.agent
+ *
+ * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.management.agent/jdk.internal.agent
+ *
  * @build jdk.testlibrary.* TestManager TestApplication
  * @run main/othervm/timeout=300 LocalManagementTest
  */

--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -53,13 +53,17 @@
 /**
  * @test
  * @bug 7110104
+ * @key randomness intermittent
+ * @summary Makes sure that enabling/disabling the management agent through JCMD
+ *          achieves the desired results
+ *
  * @library /lib/testlibrary
- * @modules jdk.management.agent/jdk.internal.agent
+ * @modules java.management
+ *          java.rmi
+ *          jdk.management.agent/jdk.internal.agent
+ *
  * @build jdk.testlibrary.* JMXStartStopTest PortAllocator TestApp ManagementAgentJcmd
  * @run main/othervm/timeout=600 -XX:+UsePerfData JMXStartStopTest
- * @summary Makes sure that enabling/disabling the management agent through JCMD
- *          achieves the desired results
- * @key randomness intermittent
  */
 public class JMXStartStopTest {
     private static final String TEST_APP_NAME = "TestApp";

--- a/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Mon Mar 20 23:49:33 2017 +0100
+++ b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Wed Mar 22 17:57:22 2017 -0700
@@ -39,10 +39,9 @@
  *
  * @library /test/lib
  * @library /lib/testlibrary
- * @modules jdk.hotspot.agent/sun.jvm.hotspot
+ * @modules java.management
+ *          jdk.hotspot.agent/sun.jvm.hotspot
  *
- * @build jdk.testlibrary.*
- * @build jdk.test.lib.apps.*
  * @build JMapHeapConfigTest TmtoolTestScenario
  * @run main JMapHeapConfigTest
  */