diff --git a/test/jdk/java/nio/Buffer/CharBufferAsCharSequenceTest.java b/test/jdk/java/nio/Buffer/CharBufferAsCharSequenceTest.java
index ae5a6122712..4b2d0822e98 100644
--- a/test/jdk/java/nio/Buffer/CharBufferAsCharSequenceTest.java
+++ b/test/jdk/java/nio/Buffer/CharBufferAsCharSequenceTest.java
@@ -313,6 +313,18 @@ public class CharBufferAsCharSequenceTest {
         assertFalse(codePoints.hasNext(), "codePoints has more elements than expected " + description);
     }
 
+    @ParameterizedTest(name="{4}")
+    @MethodSource("charBufferArguments")
+    void testCodePointCount(CharSequence actual, char[] expected, int start, int stop, String description) {
+        int expectedCount = 0;
+        OfInt it = actual.codePoints().iterator();
+        while (it.hasNext()) {
+            it.nextInt();
+            expectedCount++;
+        }
+        assertEquals(expectedCount, actual.codePointCount(), "codePointCount for " + description);
+    }
+
     @ParameterizedTest(name="{4}")
     @MethodSource("charBufferArguments")
     void testSubSequence(CharSequence actual, char[] expected, int start, int stop, String description) {