--- old/test/java/lang/ProcessHandle/TEST.properties	2015-10-27 15:55:33.000000000 +0300
+++ new/test/java/lang/ProcessHandle/TEST.properties	2015-10-27 15:55:33.000000000 +0300
@@ -1,4 +1,4 @@
 # ProcessHandle tests use TestNG
 TestNG.dirs = .
 lib.dirs = /lib/testlibrary
-
+modules = jdk.management
--- old/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java	2015-10-27 15:55:34.000000000 +0300
+++ new/test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java	2015-10-27 15:55:34.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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 7122142
  * @summary Test deadlock situation when recursive annotations are parsed
+ * @modules java.management
  */
 
 import java.lang.annotation.Retention;
--- old/test/java/lang/instrument/AddTransformerTest.java	2015-10-27 15:55:35.000000000 +0300
+++ new/test/java/lang/instrument/AddTransformerTest.java	2015-10-27 15:55:35.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary confirms that added transformers all really run
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build AddTransformerTest ATransformerManagementTestCase
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar AddTransformerTest AddTransformerTest
--- old/test/java/lang/instrument/AppendToBootstrapClassPathTest.java	2015-10-27 15:55:37.000000000 +0300
+++ new/test/java/lang/instrument/AppendToBootstrapClassPathTest.java	2015-10-27 15:55:36.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary simple test for the Boot-Class-Path manifest attribute
  * @author Gabriel Adauto, Wily Technology, Robert Field, Sun Microsystems
  *
- * @modules java.instrument
  * @run build AppendToBootstrapClassPathTest ExampleForBootClassPath
  * @run shell AppendToBootstrapClassPathSetUp.sh
  * @run shell MakeJAR.sh bootclasspathAgent
--- old/test/java/lang/instrument/AppendToClassPathTest.java	2015-10-27 15:55:38.000000000 +0300
+++ new/test/java/lang/instrument/AppendToClassPathTest.java	2015-10-27 15:55:37.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary simple test for the Class-Path manifest attribute
  * @author Gabriel Adauto, Wily Technology; Robert Field, Sun Microsystems
  *
- * @modules java.instrument
  * @run build AppendToClassPathTest
  * @run shell AppendToClassPathSetUp.sh
  * @run shell MakeJAR.sh classpathAgent
--- old/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	2015-10-27 15:55:39.000000000 +0300
+++ new/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	2015-10-27 15:55:38.000000000 +0300
@@ -27,7 +27,6 @@
 #          attribute.
 #
 # @key intermittent
-# @modules java.instrument
 # @run shell/timeout=240 BootClassPathTest.sh
 
 if [ "${TESTJAVA}" = "" ]
--- old/test/java/lang/instrument/FromShutdownHook.java	2015-10-27 15:55:40.000000000 +0300
+++ new/test/java/lang/instrument/FromShutdownHook.java	2015-10-27 15:55:39.000000000 +0300
@@ -26,7 +26,6 @@
  * @bug 5050487
  * @summary Check that Instrumentation methods can execute from a runtime
  *          shutdown hook
- * @modules java.instrument
  * @run build FromShutdownHook
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar FromShutdownHook FromShutdownHook
--- old/test/java/lang/instrument/GetAllLoadedClassesTest.java	2015-10-27 15:55:41.000000000 +0300
+++ new/test/java/lang/instrument/GetAllLoadedClassesTest.java	2015-10-27 15:55:41.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary simple tests for getAllLoadedClasses (is Object there? does a newly loaded class show up?)
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build GetAllLoadedClassesTest DummyClass
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetAllLoadedClassesTest GetAllLoadedClassesTest
--- old/test/java/lang/instrument/GetInitiatedClassesTest.java	2015-10-27 15:55:42.000000000 +0300
+++ new/test/java/lang/instrument/GetInitiatedClassesTest.java	2015-10-27 15:55:42.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary simple tests for getInitiatedClasses (does a newly loaded class show up?)
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build GetInitiatedClassesTest DummyClass
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetInitiatedClassesTest GetInitiatedClassesTest
--- old/test/java/lang/instrument/GetObjectSizeTest.java	2015-10-27 15:55:43.000000000 +0300
+++ new/test/java/lang/instrument/GetObjectSizeTest.java	2015-10-27 15:55:43.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary round-trip test for getObjectSize (does it return, and is the result non-zero?)
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build GetObjectSizeTest
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetObjectSizeTest GetObjectSizeTest
--- old/test/java/lang/instrument/IsModifiableClassAgent.java	2015-10-27 15:55:44.000000000 +0300
+++ new/test/java/lang/instrument/IsModifiableClassAgent.java	2015-10-27 15:55:44.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test isModifiableClass
  * @author Robert Field, Sun Microsystems
  *
- * @modules java.instrument
  * @run build IsModifiableClassApp IsModifiableClassAgent
  * @run shell MakeJAR3.sh IsModifiableClassAgent 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:IsModifiableClassAgent.jar IsModifiableClassApp
--- old/test/java/lang/instrument/ManifestTest.sh	2015-10-27 15:55:45.000000000 +0300
+++ new/test/java/lang/instrument/ManifestTest.sh	2015-10-27 15:55:45.000000000 +0300
@@ -27,7 +27,6 @@
 # @author Daniel D. Daugherty
 #
 # @key intermittent
-# @modules java.instrument
 # @run build ManifestTestApp ExampleForBootClassPath
 # @run shell/timeout=900 ManifestTest.sh
 #
--- old/test/java/lang/instrument/NativeMethodPrefixAgent.java	2015-10-27 15:55:46.000000000 +0300
+++ new/test/java/lang/instrument/NativeMethodPrefixAgent.java	2015-10-27 15:55:46.000000000 +0300
@@ -28,6 +28,8 @@
  * @author Robert Field, Sun Microsystems
  *
  * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.management
+ *          java.instrument
  * @run shell/timeout=240 MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
  * @run main/othervm -javaagent:NativeMethodPrefixAgent.jar NativeMethodPrefixApp
  */
--- old/test/java/lang/instrument/NoTransformerAddedTest.java	2015-10-27 15:55:47.000000000 +0300
+++ new/test/java/lang/instrument/NoTransformerAddedTest.java	2015-10-27 15:55:47.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary make sure no transformers run when none are registered
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build NoTransformerAddedTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NoTransformerAddedTest NoTransformerAddedTest
--- old/test/java/lang/instrument/NullGetObjectSizeTest.java	2015-10-27 15:55:48.000000000 +0300
+++ new/test/java/lang/instrument/NullGetObjectSizeTest.java	2015-10-27 15:55:48.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary make sure getObjectSize(null) throws NullPointerException.
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build NullGetObjectSizeTest
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar NullGetObjectSizeTest NullGetObjectSizeTest
--- old/test/java/lang/instrument/NullRedefineClassesTests.java	2015-10-27 15:55:49.000000000 +0300
+++ new/test/java/lang/instrument/NullRedefineClassesTests.java	2015-10-27 15:55:49.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary make sure redefineClasses throws NullPointerException in the right places.
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build NullRedefineClassesTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullRedefineClassesTests NullRedefineClassesTests
--- old/test/java/lang/instrument/NullTransformerAddTest.java	2015-10-27 15:55:50.000000000 +0300
+++ new/test/java/lang/instrument/NullTransformerAddTest.java	2015-10-27 15:55:50.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary make sure addTransformer(null) throws what it should
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build NullTransformerAddTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullTransformerAddTest NullTransformerAddTest
--- old/test/java/lang/instrument/NullTransformerRemoveTest.java	2015-10-27 15:55:52.000000000 +0300
+++ new/test/java/lang/instrument/NullTransformerRemoveTest.java	2015-10-27 15:55:51.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary make sure removeTransformer(null) throws NullPointerException
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build NullTransformerRemoveTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullTransformerRemoveTest NullTransformerRemoveTest
--- old/test/java/lang/instrument/ParallelTransformerLoader.sh	2015-10-27 15:55:53.000000000 +0300
+++ new/test/java/lang/instrument/ParallelTransformerLoader.sh	2015-10-27 15:55:52.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary Test parallel class loading by parallel transformers.
 # @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
 #
-# @modules java.instrument
 # @run shell MakeJAR3.sh ParallelTransformerLoaderAgent
 # @run build ParallelTransformerLoaderApp
 # @run shell/timeout=240 ParallelTransformerLoader.sh
--- old/test/java/lang/instrument/PremainClass/InheritAgent0010.java	2015-10-27 15:55:54.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent0010.java	2015-10-27 15:55:53.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (0,0,1,0): declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0010
  * @run main/othervm -javaagent:InheritAgent0010.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent0011.java	2015-10-27 15:55:55.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent0011.java	2015-10-27 15:55:55.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0011
  * @run main/othervm -javaagent:InheritAgent0011.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent0110.java	2015-10-27 15:55:56.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent0110.java	2015-10-27 15:55:56.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (0,1,1,0): inherited 1-arg and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0110
  * @run main/othervm -javaagent:InheritAgent0110.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent0111.java	2015-10-27 15:55:57.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent0111.java	2015-10-27 15:55:57.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (0,1,1,1): inherited 1-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0111
  * @run main/othervm -javaagent:InheritAgent0111.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1000.java	2015-10-27 15:55:58.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1000.java	2015-10-27 15:55:58.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,0,0,0): inherited 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1000
  * @run main/othervm -javaagent:InheritAgent1000.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1001.java	2015-10-27 15:55:59.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1001.java	2015-10-27 15:55:59.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,0,0,1): inherited 2-arg, and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1001
  * @run main/othervm -javaagent:InheritAgent1001.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1010.java	2015-10-27 15:56:00.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1010.java	2015-10-27 15:56:00.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,0,1,0): inherited 2-arg, and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1010
  * @run main/othervm -javaagent:InheritAgent1010.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1011.java	2015-10-27 15:56:01.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1011.java	2015-10-27 15:56:01.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,0,1,1): inherited 2-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1011
  * @run main/othervm -javaagent:InheritAgent1011.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1100.java	2015-10-27 15:56:02.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1100.java	2015-10-27 15:56:02.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,1,0,0): inherited 2-arg and inherited 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1100
  * @run main/othervm -javaagent:InheritAgent1100.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1101.java	2015-10-27 15:56:03.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1101.java	2015-10-27 15:56:03.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,1,0,1): inherited 2-arg, inherited 1-arg, and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1101
  * @run main/othervm -javaagent:InheritAgent1101.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1110.java	2015-10-27 15:56:04.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1110.java	2015-10-27 15:56:04.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,1,1,0): inherited 2-arg, inherited 1-arg, and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1110
  * @run main/othervm -javaagent:InheritAgent1110.jar DummyMain
  */
--- old/test/java/lang/instrument/PremainClass/InheritAgent1111.java	2015-10-27 15:56:06.000000000 +0300
+++ new/test/java/lang/instrument/PremainClass/InheritAgent1111.java	2015-10-27 15:56:05.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test config (1,1,1,1): inherited 2-arg, inherited 1-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1111
  * @run main/othervm -javaagent:InheritAgent1111.jar DummyMain
  */
--- old/test/java/lang/instrument/RedefineBigClass.sh	2015-10-27 15:56:07.000000000 +0300
+++ new/test/java/lang/instrument/RedefineBigClass.sh	2015-10-27 15:56:06.000000000 +0300
@@ -28,6 +28,7 @@
 #
 # @key intermittent
 # @modules java.instrument
+#          java.management
 # @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
 # @run build BigClass RedefineBigClassApp NMTHelper
 # @run shell/timeout=600 RedefineBigClass.sh
--- old/test/java/lang/instrument/RedefineClassWithNativeMethod.sh	2015-10-27 15:56:08.000000000 +0300
+++ new/test/java/lang/instrument/RedefineClassWithNativeMethod.sh	2015-10-27 15:56:07.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary Redefine a class with a native method.
 # @author Daniel D. Daugherty as modified from the test submitted by clovis@par.univie.ac.at
 #
-# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineClassWithNativeMethodAgent 'Can-Redefine-Classes: true'
 # @run build RedefineClassWithNativeMethodApp
 # @run shell RedefineClassWithNativeMethod.sh
--- old/test/java/lang/instrument/RedefineClassesDisabledTest.java	2015-10-27 15:56:09.000000000 +0300
+++ new/test/java/lang/instrument/RedefineClassesDisabledTest.java	2015-10-27 15:56:08.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test that redefineClasses and isRedefineClassesSupported behave correctly when redefine is not enabled
  * @author Robert Field, Sun Microsystems -- as modified from the work of Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build RedefineClassesDisabledTest
  * @run shell RedefineSetUp.sh
  * @run shell MakeJAR.sh basicAgent
--- old/test/java/lang/instrument/RedefineClassesTests.java	2015-10-27 15:56:10.000000000 +0300
+++ new/test/java/lang/instrument/RedefineClassesTests.java	2015-10-27 15:56:10.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary insure redefine is supported. exercise a class, then redefine it and do it again
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build RedefineClassesTests
  * @run shell RedefineSetUp.sh
  * @run shell MakeJAR.sh redefineAgent
--- old/test/java/lang/instrument/RedefineMethodAddInvoke.sh	2015-10-27 15:56:11.000000000 +0300
+++ new/test/java/lang/instrument/RedefineMethodAddInvoke.sh	2015-10-27 15:56:11.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary Reflexive invocation of newly added methods broken.
 # @author Daniel D. Daugherty
 #
-# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodAddInvokeAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodAddInvokeApp
 # @run shell RedefineMethodAddInvoke.sh
--- old/test/java/lang/instrument/RedefineMethodDelInvoke.sh	2015-10-27 15:56:12.000000000 +0300
+++ new/test/java/lang/instrument/RedefineMethodDelInvoke.sh	2015-10-27 15:56:12.000000000 +0300
@@ -27,7 +27,6 @@
 # @author Daniel D. Daugherty
 # @author Serguei Spitsyn
 #
-# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodDelInvokeAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodDelInvokeApp
 # @run shell RedefineMethodDelInvoke.sh
--- old/test/java/lang/instrument/RedefineMethodInBacktrace.sh	2015-10-27 15:56:14.000000000 +0300
+++ new/test/java/lang/instrument/RedefineMethodInBacktrace.sh	2015-10-27 15:56:13.000000000 +0300
@@ -27,6 +27,7 @@
 # @author Stefan Karlsson
 #
 # @modules java.instrument
+#          java.management
 # @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
 # @run shell RedefineMethodInBacktrace.sh
--- old/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	2015-10-27 15:56:15.000000000 +0300
+++ new/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	2015-10-27 15:56:14.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary Method annotations are incorrectly set when redefining classes.
 # @author Stefan Karlsson
 #
-# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
 # @run shell RedefineMethodWithAnnotations.sh
--- old/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	2015-10-27 15:56:16.000000000 +0300
+++ new/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	2015-10-27 15:56:15.000000000 +0300
@@ -28,7 +28,6 @@
 #   verify that the right methods are called.
 # @author Daniel D. Daugherty
 #
-# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineSubclassWithTwoInterfacesAgent 'Can-Redefine-Classes: true'
 # @run build RedefineSubclassWithTwoInterfacesApp
 # @run shell RedefineSubclassWithTwoInterfaces.sh
--- old/test/java/lang/instrument/RemoveAbsentTransformerTest.java	2015-10-27 15:56:17.000000000 +0300
+++ new/test/java/lang/instrument/RemoveAbsentTransformerTest.java	2015-10-27 15:56:16.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary remove an transformer that was never added
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build RemoveAbsentTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar RemoveAbsentTransformerTest RemoveAbsentTransformerTest
--- old/test/java/lang/instrument/RemoveTransformerTest.java	2015-10-27 15:56:18.000000000 +0300
+++ new/test/java/lang/instrument/RemoveTransformerTest.java	2015-10-27 15:56:18.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary simple remove of a transformer that was added
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build RemoveTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar RemoveTransformerTest RemoveTransformerTest
--- old/test/java/lang/instrument/RetransformBigClass.sh	2015-10-27 15:56:19.000000000 +0300
+++ new/test/java/lang/instrument/RetransformBigClass.sh	2015-10-27 15:56:19.000000000 +0300
@@ -28,6 +28,7 @@
 #
 # @key intermittent
 # @modules java.instrument
+#          java.management
 # @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
 # @run build BigClass RetransformBigClassApp NMTHelper
 # @run shell/timeout=600 RetransformBigClass.sh
--- old/test/java/lang/instrument/SingleTransformerTest.java	2015-10-27 15:56:20.000000000 +0300
+++ new/test/java/lang/instrument/SingleTransformerTest.java	2015-10-27 15:56:20.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary simple test with one transformer (makes sure it gets called)
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build SingleTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar SingleTransformerTest SingleTransformerTest
--- old/test/java/lang/instrument/StressGetObjectSizeTest.sh	2015-10-27 15:56:21.000000000 +0300
+++ new/test/java/lang/instrument/StressGetObjectSizeTest.sh	2015-10-27 15:56:21.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary stress getObjectSize() API
 # @author Daniel D. Daugherty as modified from the code of fischman@google.com
 #
-# @modules java.instrument
 # @run build StressGetObjectSizeApp
 # @run shell MakeJAR.sh basicAgent
 # @run shell StressGetObjectSizeTest.sh
--- old/test/java/lang/instrument/TransformMethodTest.java	2015-10-27 15:56:22.000000000 +0300
+++ new/test/java/lang/instrument/TransformMethodTest.java	2015-10-27 15:56:22.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary test transformer add/remove pairs in sequence
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build TransformMethodTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformMethodTest TransformMethodTest
--- old/test/java/lang/instrument/TransformerManagementThreadAddTests.java	2015-10-27 15:56:23.000000000 +0300
+++ new/test/java/lang/instrument/TransformerManagementThreadAddTests.java	2015-10-27 15:56:23.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary multi-thread test to exercise sync and contention for adds to transformer registry
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build TransformerManagementThreadAddTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadAddTests TransformerManagementThreadAddTests
--- old/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java	2015-10-27 15:56:25.000000000 +0300
+++ new/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java	2015-10-27 15:56:24.000000000 +0300
@@ -27,7 +27,6 @@
  * @summary multi-thread test to exercise sync and contention for removes to transformer registry
  * @author Gabriel Adauto, Wily Technology
  *
- * @modules java.instrument
  * @run build TransformerManagementThreadRemoveTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadRemoveTests TransformerManagementThreadRemoveTests
--- old/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	2015-10-27 15:56:26.000000000 +0300
+++ new/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	2015-10-27 15:56:26.000000000 +0300
@@ -29,7 +29,6 @@
 # transform() on a retransform operation.
 # @author Daniel D. Daugherty
 #
-# @modules java.instrument
 # @run build VerifyLocalVariableTableOnRetransformTest
 # @run compile -g DummyClassWithLVT.java
 # @run shell MakeJAR.sh retransformAgent
--- old/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	2015-10-27 15:56:27.000000000 +0300
+++ new/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	2015-10-27 15:56:27.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
-# @modules java.instrument
 # @run shell/timeout=240 CircularityErrorTest.sh
 
 if [ "${TESTSRC}" = "" ]
--- old/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	2015-10-27 15:56:28.000000000 +0300
+++ new/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	2015-10-27 15:56:28.000000000 +0300
@@ -26,7 +26,6 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
-# @modules java.instrument
 # @build ClassUnloadTest
 # @run shell ClassUnloadTest.sh
 
--- old/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	2015-10-27 15:56:29.000000000 +0300
+++ new/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	2015-10-27 15:56:29.000000000 +0300
@@ -29,7 +29,6 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
-# @modules java.instrument
 # @build Agent AgentSupport BootSupport BasicTest PrematureLoadTest DynamicTest
 # @run shell/timeout=240 run_tests.sh
 
--- old/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java	2015-10-27 15:56:30.000000000 +0300
+++ new/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java	2015-10-27 15:56:30.000000000 +0300
@@ -28,6 +28,7 @@
  * @summary Test verifies that lambda forms are cached when run with multiple threads
  * @author kshefov
  * @library /lib/testlibrary/jsr292 /lib/testlibrary
+ * @modules java.management
  * @build TestMethods
  * @build LambdaFormTestCase
  * @build LFCachingTestCase
--- old/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java	2015-10-27 15:56:32.000000000 +0300
+++ new/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java	2015-10-27 15:56:31.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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 8003881
  * @summary tests DoPrivileged action (implemented as lambda expressions) by
  * inserting them into the BootClassPath.
+ * @modules jdk.compiler
  * @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java LUtils.java
  * @run main/othervm LambdaAccessControlDoPrivilegedTest
  */
--- old/test/java/lang/invoke/lambda/LambdaAccessControlTest.java	2015-10-27 15:56:33.000000000 +0300
+++ new/test/java/lang/invoke/lambda/LambdaAccessControlTest.java	2015-10-27 15:56:32.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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 8003881
  * @summary tests Lambda expression with a a security manager at top level
+ * @modules jdk.compiler
  * @compile -XDignore.symbol.file LambdaAccessControlTest.java LUtils.java
  *
  * @run main/othervm LambdaAccessControlTest
--- old/test/java/lang/invoke/lambda/LambdaAsm.java	2015-10-27 15:56:34.000000000 +0300
+++ new/test/java/lang/invoke/lambda/LambdaAsm.java	2015-10-27 15:56:33.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
--- old/test/java/lang/invoke/lambda/LambdaStackTrace.java	2015-10-27 15:56:35.000000000 +0300
+++ new/test/java/lang/invoke/lambda/LambdaStackTrace.java	2015-10-27 15:56:35.000000000 +0300
@@ -26,6 +26,7 @@
  * @bug 8025636
  * @summary Synthetic frames should be hidden in exceptions
  * @modules java.base/jdk.internal.org.objectweb.asm
+ *          jdk.compiler
  * @compile -XDignore.symbol.file LUtils.java LambdaStackTrace.java
  * @run main LambdaStackTrace
  */
--- old/test/jdk/lambda/TEST.properties	2015-10-27 15:56:36.000000000 +0300
+++ new/test/jdk/lambda/TEST.properties	2015-10-27 15:56:36.000000000 +0300
@@ -3,3 +3,4 @@
 TestNG.dirs = .
 
 javatest.maxOutputSize = 250000
+modules = jdk.compiler
--- old/test/sun/misc/JarIndex/metaInfFilenames/Basic.java	2015-10-27 15:56:37.000000000 +0300
+++ new/test/sun/misc/JarIndex/metaInfFilenames/Basic.java	2015-10-27 15:56:37.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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,8 @@
  * @bug 6887710
  * @summary Verify the impact of sun.misc.JarIndex.metaInfFilenames on ServiceLoader
  * @modules jdk.jartool/sun.tools.jar
+ *          jdk.httpserver
+ *          jdk.compiler
  * @run main/othervm Basic
  */
 
--- old/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java	2015-10-27 15:56:38.000000000 +0300
+++ new/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java	2015-10-27 15:56:38.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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,7 +26,7 @@
  * @bug 7194897
  * @summary JSR 292: Cannot create more than 16 instances of an anonymous class
  * @modules java.base/sun.misc
- * @modules java.management
+ *          java.management
  * @library /lib/testlibrary
  * @author  Robert Field
  * @compile -XDignore.symbol.file ManyNewInstanceAnonTest.java
--- old/test/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java	2015-10-27 15:56:40.000000000 +0300
+++ new/test/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java	2015-10-27 15:56:39.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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 8003639
  * @summary defaultMethod resolution and verification using an URLClassLoader
+ * @modules jdk.compiler
  * @compile -XDignore.symbol.file=true DefaultMethodRegressionTestsRun.java
  * @run main DefaultMethodRegressionTestsRun
  */
--- /dev/null	2015-10-27 15:56:41.000000000 +0300
+++ new/test/java/lang/instrument/TEST.properties	2015-10-27 15:56:40.000000000 +0300
@@ -0,0 +1 @@
+modules = java.instrument