diff --git a/test/jdk/java/lang/Character/Supplementary.java b/test/jdk/java/lang/Character/Supplementary.java
index e8a5a998888..475d6870bd6 100644
--- a/test/jdk/java/lang/Character/Supplementary.java
+++ b/test/jdk/java/lang/Character/Supplementary.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4533872 4985214 4985217 4993841 5017268 5017280 8298033
+ * @bug 4533872 4985214 4985217 4993841 5017268 5017280 8298033 8364007
  * @summary Unit tests for supplementary character support (JSR-204)
  * @compile Supplementary.java
  * @run main/timeout=600 Supplementary
diff --git a/test/jdk/java/lang/String/Supplementary.java b/test/jdk/java/lang/String/Supplementary.java
index ead3d006f6b..35c67139f69 100644
--- a/test/jdk/java/lang/String/Supplementary.java
+++ b/test/jdk/java/lang/String/Supplementary.java
@@ -24,7 +24,7 @@
 /*
  *
  * @test
- * @bug 4533872 4915683 4922962 4985217 5017280 6242664 6588260
+ * @bug 4533872 4915683 4922962 4985217 5017280 6242664 6588260 8364007
  * @summary Unit tests for supplementary character support (JSR-204)
  */
 
@@ -386,7 +386,8 @@ public class Supplementary {
     }
 
     /**
-     * Test codePointCount(int, int)
+     * Test codePointCount(int, int) &
+     *      codePointCount()
      *
      * This test case assumes that Character.codePointCount() &
      * Character.codePointCount(CharSequence, int, int) works
diff --git a/test/jdk/java/lang/StringBuffer/Supplementary.java b/test/jdk/java/lang/StringBuffer/Supplementary.java
index 0cc56cc3778..aca97c4140d 100644
--- a/test/jdk/java/lang/StringBuffer/Supplementary.java
+++ b/test/jdk/java/lang/StringBuffer/Supplementary.java
@@ -24,7 +24,7 @@
 /*
  *
  * @test
- * @bug 4533872 4915683 4985217 5017280 6937112
+ * @bug 4533872 4915683 4985217 5017280 6937112 8364007
  * @summary Unit tests for supplementary character support (JSR-204)
  */