--- a/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -30,7 +30,6 @@
 #           TTY: dump <ArrayReference> command not implemented.
 #  @author Tim Bell
 #
-#  @key intermittent
 #  @run shell ArrayLengthDumpTest.sh
 #
 classname=ArrayLengthDumpTarg

--- a/jdk/test/com/sun/jdi/BreakpointTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/BreakpointTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author jjh
  *
- *  @key intermittent
  *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g BreakpointTest.java

--- a/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 #  @author dcubed (based on the test program posted to the following
 #  Eclipse thread https://bugs.eclipse.org/bugs/show_bug.cgi?id=279137)
 #
-#  @key intermittent
 #  @run shell BreakpointWithFullGC.sh
 
 compileOptions=-g

--- a/jdk/test/com/sun/jdi/CatchAllTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/CatchAllTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 #  @summary REGRESSION: jdb rejects the syntax catch java.lang.IndexOutOfBoundsException
 #  @author Tim Bell
 #
-#  @key intermittent
 #  @run shell CatchAllTest.sh
 #
 classname=CatchAllTestTarg

--- a/jdk/test/com/sun/jdi/CatchCaughtTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/CatchCaughtTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 #  @summary TTY: 'catch caught' with no class pattern throws NullPointerException
 #  @author Tim Bell
 #
-#  @key intermittent
 #  @run shell CatchCaughtTest.sh
 #
 classname=CatchCaughtTestTarg

--- a/jdk/test/com/sun/jdi/CatchPatternTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/CatchPatternTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
 #  @summary TTY: surprising ExceptionSpec.resolveEventRequest() wildcard results
 #  @author Tim Bell
 #
-#  @key intermittent
 #  @run shell CatchPatternTest.sh
 classname=CatchPatternTestTarg
 createJavaFile()

--- a/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
 #  @bug 4507088
 #  @summary TTY: Add a comment delimiter to the jdb command set
 #  @author Tim Bell
-#  @key intermittent
 #  @run shell CommandCommentDelimiter.sh
 #
 

--- a/jdk/test/com/sun/jdi/DeoptimizeWalk.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/DeoptimizeWalk.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
 #  @bug 4525714
 #  @summary jtreg test PopAsynchronousTest fails in build 85 with -Xcomp
 #  @author Jim Holmlund/Swamy Venkataramanappa
-#  @key intermittent
 #  @run shell DeoptimizeWalk.sh
 
 #  This is another test of the same bug.  The bug occurs when trying

--- a/jdk/test/com/sun/jdi/ExceptionEvents.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/ExceptionEvents.java	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field
  *
- *  @key intermittent
  *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ExceptionEvents.java

--- a/jdk/test/com/sun/jdi/JdbExprTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/JdbExprTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
 #  @test
 #  @bug 4660158
 #  @author Staffan Larsen
-#  @key intermittent
 #  @run shell JdbExprTest.sh
 
 # These are variables that can be set to control execution

--- a/jdk/test/com/sun/jdi/JdbMissStep.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/JdbMissStep.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
 #  @summary REGRESSION: jdb / jdi not stopping at some breakpoints and steps in j2sdk1.4.
 #  @author Jim Holmlund
 #
-#  @key intermittent
 #  @run shell JdbMissStep.sh
 
 # These are variables that can be set to control execution

--- a/jdk/test/com/sun/jdi/JdbVarargsTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/JdbVarargsTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 #
 #  @author jjh
 #
-#  @key intermittent
 #  @run shell JdbVarargsTest.sh
 
 classname=JdbVarargsTest

--- a/jdk/test/com/sun/jdi/MixedSuspendTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/MixedSuspendTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 # 
 #  @author Jim Holmlund
 # 
-#  @key intermittent
 #  @modules jdk.jdi
 #  @run build TestScaffold VMConnection TargetListener TargetAdapter
 #  @run shell MixedSuspendTest.sh

--- a/jdk/test/com/sun/jdi/NotAField.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/NotAField.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 #  @summary TTY: NullPointerException at
 #           com.sun.tools.jdi.MirrorImpl.validateMirrors
 #  @author Tim Bell
-#  @key intermittent
 #  @run shell NotAField.sh
 #
 

--- a/jdk/test/com/sun/jdi/RedefineAbstractClass.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineAbstractClass.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -31,7 +31,6 @@
 #   methods are called.
 # @author Daniel D. Daugherty
 #
-# @key intermittent
 # @run shell RedefineAbstractClass.sh
 
 compileOptions=-g

--- a/jdk/test/com/sun/jdi/RedefineAnnotation.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineAnnotation.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
 #  @summary Redefine a class that has an annotation and verify that the
 #    new annotation is returned.
 #
-#  @key intermittent
 #  @run shell RedefineAnnotation.sh
 
 compileOptions=-g

--- a/jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
 #  @bug 4705330
 #  @summary Netbeans Fix and Continue crashes JVM
 #  @author Jim Holmlund/Swamy Venkataramanappa
-#  @key intermittent
 #  @run shell RedefineClearBreakpoint.sh
 
 #  The failure occurs after a bkpt is set and then cleared

--- a/jdk/test/com/sun/jdi/RedefineException.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineException.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
 #  @summary The VM crashes when a method in a redefined class throws an exception.
 #  @author Jim Holmlund
 #
-#  @key intermittent
 #  @run shell RedefineException.sh
 
 # This is another symptomm of 4559100

--- a/jdk/test/com/sun/jdi/RedefineFinal.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineFinal.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
 #  @bug 4788344
 #  @summary RedefineClasses is an apparent no-op if instance method is final
 #
-#  @key intermittent
 #  @run shell RedefineFinal.sh
 
 compileOptions=-g

--- a/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
 #  @bug 6394084
 #  @summary Redefine class can't handle addition of 64 bit constants in JDK1.5.0_05
 #
-#  @key intermittent
 #  @run shell RedefineIntConstantToLong.sh
 
 compileOptions=-g

--- a/jdk/test/com/sun/jdi/RedefinePop.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefinePop.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -30,7 +30,6 @@
 #
 #  The failure occurs with debug java when the pop deletes the
 #  line that called the method which is being popped.
-#  @key intermittent
 #  @run shell RedefinePop.sh
 
 

--- a/jdk/test/com/sun/jdi/RedefineStep.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineStep.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
 #  @bug 4689395
 #  @summary "step over" after a class is redefined acts like "step out"
 #  @author Jim Holmlund
-#  @key intermittent
 #  @run shell RedefineStep.sh
 #
 

--- a/jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
 #  @bug 4660756
 #  @summary TTY: Need to clear source cache after doing a redefine class
 #  @author Jim Holmlund
-#  @key intermittent
 #  @run shell/timeout=240 RedefineTTYLineNumber.sh
 
 #set -x

--- a/jdk/test/com/sun/jdi/SimulResumerTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/SimulResumerTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author jjh
  *
- *  @key intermittent
  *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SimulResumerTest.java

--- a/jdk/test/com/sun/jdi/StringConvertTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/StringConvertTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -29,7 +29,6 @@
 #           2. TTY: run on expression evaluation
 #  @author jim/suvasis mukherjee
 #
-#  @key intermittent
 #  @run shell StringConvertTest.sh
 
 #  Run this script to see the bug.  See comments at the end

--- a/jdk/test/com/sun/jdi/sde/FilterMangleTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/jdi/sde/FilterMangleTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -5,7 +5,6 @@
  *
  *  @author Robert Field / Jim Holmlund
  *
- *  @key intermittent
  *  @library ..
  *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE

--- a/jdk/test/com/sun/tools/attach/BasicTests.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java	Tue Jul 21 18:38:09 2015 +0200
@@ -41,7 +41,7 @@
  * @test
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
- * @key intermittent
+ * @modules jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @modules java.instrument
  *          java.management

--- a/jdk/test/java/lang/ClassLoader/Assert.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/java/lang/ClassLoader/Assert.java	Tue Jul 21 18:38:09 2015 +0200
@@ -28,7 +28,7 @@
  * @run main/othervm Assert
  * @summary Test the assertion facility
  * @author Mike McCloskey
- * @key randomness intermittent
+ * @key randomness
  */
 
 import package1.*;

--- a/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
 # @summary Test non US-ASCII characters in the value of the Boot-Class-Path
 #          attribute.
 #
-# @key intermittent
 # @modules java.instrument
 # @run shell/timeout=240 BootClassPathTest.sh
 

--- a/jdk/test/java/lang/instrument/ManifestTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/java/lang/instrument/ManifestTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
 # @summary JLI JAR manifest processing should ignore leading and trailing white space.
 # @author Daniel D. Daugherty
 #
-# @key intermittent
 # @modules java.instrument
 # @run build ManifestTestApp ExampleForBootClassPath
 # @run shell/timeout=900 ManifestTest.sh

--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
  * @summary test config (0,1,0,1): inherited 1-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
- * @key intermittent
  * @run shell ../MakeJAR3.sh InheritAgent0101
  * @run main/othervm -javaagent:InheritAgent0101.jar DummyMain
  */

--- a/jdk/test/java/lang/instrument/RedefineBigClass.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
 # @summary Redefine a big class.
 # @author Daniel D. Daugherty
 #
-# @key intermittent
 # @modules java.instrument
 # @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
 # @run build BigClass RedefineBigClassApp NMTHelper

--- a/jdk/test/java/lang/instrument/RetransformBigClass.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/java/lang/instrument/RetransformBigClass.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
 # @summary Retransform a big class.
 # @author Daniel D. Daugherty
 #
-# @key intermittent
 # @modules java.instrument
 # @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
 # @run build BigClass RetransformBigClassApp NMTHelper

--- a/jdk/test/javax/management/monitor/ReflectionExceptionTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/javax/management/monitor/ReflectionExceptionTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
  * @summary Test that the jmx.monitor.error.runtime monitor notification
  *          is emitted when getAttribute throws ReflectionException.
  * @author Luis-Miguel Alventosa
- * @key intermittent
  * @modules java.management
  * @run clean ReflectionExceptionTest MBeanServerBuilderImpl
  *            MBeanServerForwarderInvocationHandler

--- a/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
- * @key intermittent
  * @modules java.management
  * @run clean StringMonitorDeadlockTest
  * @run build StringMonitorDeadlockTest

--- a/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
  * @bug 6292705
  * @summary Test support for arrays in parameterized types.
  * @author Luis-Miguel Alventosa
- * @key intermittent
  * @modules java.management
  * @run clean GenericArrayTypeTest
  * @run build GenericArrayTypeTest

--- a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
  * @bug 4940957 8025205
  * @summary Tests behaviour when connections break
  * @author Eamonn McManus
- * @key intermittent
  * @modules java.management
  * @run clean BrokenConnectionTest
  * @run build BrokenConnectionTest

--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -27,7 +27,6 @@
  * @summary Check the emission of notifications when a Security Manager is
  * installed. Test the property "jmx.remote.x.check.notification.emission".
  * @author Luis-Miguel Alventosa
- * @key intermittent
  * @modules java.management
  * @run clean NotificationEmissionTest
  * @run build NotificationEmissionTest

--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh	Tue Jul 21 18:38:09 2015 +0200
@@ -26,7 +26,6 @@
 # @bug     6528083
 # @summary Test RMI Bootstrap
 #
-# @key intermittent
 # @library /lib/testlibrary
 # @modules java.management/sun.management
 #          java.management/sun.management.jmxremote

--- a/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -40,7 +40,6 @@
  * @bug 8075926
  * @summary Makes sure that the current management agent status is reflected
  *          in the related performance counters.
- * @key intermittent
  * @library /lib/testlibrary
  * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
  * @run testng/othervm -XX:+UsePerfData JMXStatusPerfCountersTest

--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java	Tue Jul 21 18:38:09 2015 +0200
@@ -36,7 +36,6 @@
  * @test
  * @bug 6321286
  * @summary Unit test for jmap utility
- * @key intermittent
  * @library /lib/testlibrary
  * @library /../../test/lib/share/classes
  * @modules java.management

--- a/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java	Tue Jul 21 18:38:09 2015 +0200
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 4990825
- * @key intermittent
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser

--- a/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java	Tue Jul 21 18:38:09 2015 +0200
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 4990825 7092186
- * @key intermittent
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser

--- a/jdk/test/sun/tools/jstatd/TestJstatdPort.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/tools/jstatd/TestJstatdPort.java	Tue Jul 21 18:38:09 2015 +0200
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 4990825
- * @key intermittent
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser

--- a/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java	Mon Jul 20 13:14:47 2015 +0200
+++ b/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java	Tue Jul 21 18:38:09 2015 +0200
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 4990825
- * @key intermittent
  * @library /lib/testlibrary
  * @modules java.management
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser