diff --git a/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java b/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java
index fe963fb05e0e7531d9361bb389a38fb95c3e904f..3eae773ddbdecfa45ee3de851f118737f166f4aa 100644
--- a/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java
+++ b/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4962341
+ * @bug 4962341 6832557
  * @summary Check getEnclosingMethod method
  * @author Joseph D. Darcy
  */
@@ -57,8 +57,8 @@ public class EnclosingConstructorTests {
     }
 
 
-    static int examine(Class enclosedClass, String constructorSig) {
-        Constructor c = enclosedClass.getEnclosingConstructor();
+    static int examine(Class<?> enclosedClass, String constructorSig) {
+        Constructor<?> c = enclosedClass.getEnclosingConstructor();
         if (c == null && constructorSig == null)
             return 0;
 
diff --git a/test/java/lang/instrument/ParallelTransformerLoader.sh b/test/java/lang/instrument/ParallelTransformerLoader.sh
index cab081a5176926d9fdcbe6234416b5aa5da99226..f5cd234425a4c0bfac8506d759196dc9d4761f71 100644
--- a/test/java/lang/instrument/ParallelTransformerLoader.sh
+++ b/test/java/lang/instrument/ParallelTransformerLoader.sh
@@ -23,6 +23,7 @@
 
 # @test
 # @bug 5088398
+# @ignore until bug 6835233 dealt with
 # @summary Test parallel class loading by parallel transformers.
 # @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
 #
diff --git a/test/java/lang/management/ThreadMXBean/ThreadStateTest.java b/test/java/lang/management/ThreadMXBean/ThreadStateTest.java
index 13f841cdf74efdc2a97812fd6d9b63cbb80d2a37..46436a85fc4c7c40b9ffdc3b8d0a7cf782835d64 100644
--- a/test/java/lang/management/ThreadMXBean/ThreadStateTest.java
+++ b/test/java/lang/management/ThreadMXBean/ThreadStateTest.java
@@ -23,7 +23,8 @@
 
 /*
  * @test
- * @bug     4967283
+ * @bug     4967283 5080203
+ * @ignore  Due to 5080203, cannot rely on this test always passing.
  * @summary Basic unit test of thread states returned by
  *          ThreadMXBean.getThreadInfo.getThreadState().
  *          It also tests lock information returned by ThreadInfo.
diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
index 750e2a7d3a17f4355301e64200ecd9a42208df24..169819fe53811ce46da928bb4465cf0bbcf1407c 100644
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
@@ -26,6 +26,7 @@
 
 # @test
 # @bug 6440846
+# @ignore until 6203816 is dealt with.
 # @summary make sure we do not deadlock between ExtClassLoader and AppClassLoader
 # @author Valerie Peng
 # @run shell/timeout=20 Deadlock2.sh
diff --git a/test/java/util/logging/LoggingDeadlock2.java b/test/java/util/logging/LoggingDeadlock2.java
index 31bccfa5c3e1cf586a33c9da58942affc5c888be..cf8d67f9910d46eb196f222d9b7616ae1127c455 100644
--- a/test/java/util/logging/LoggingDeadlock2.java
+++ b/test/java/util/logging/LoggingDeadlock2.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug     6467152 6716076 6829503
+ * @ignore Until made more stable, see 6829636.
  * @summary deadlock occurs in LogManager initialization and JVM termination
  * @author  Serguei Spitsyn / Hitachi / Martin Buchholz
  *