diff --git a/server/src/test/java/org/opensearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/server/src/test/java/org/opensearch/index/fielddata/ordinals/MultiOrdinalsTests.java
index 64cb953a27cf3..8260c2dc417f5 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/ordinals/MultiOrdinalsTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/ordinals/MultiOrdinalsTests.java
@@ -128,10 +128,10 @@ public int compare(OrdAndId o1, OrdAndId o2) {
                     assertThat((long) singleOrds.ordValue(), equalTo(docOrds.get(0)));
 
                     assertTrue(docs.advanceExact(docId));
+                    assertEquals(docOrds.size(), docs.docValueCount());
                     for (Long ord : docOrds) {
                         assertThat(docs.nextOrd(), equalTo(ord));
                     }
-                    assertEquals(SortedSetDocValues.NO_MORE_DOCS, docs.nextOrd());
                 }
                 for (int i = docId + 1; i < ordAndId.id; i++) {
                     assertFalse(singleOrds.advanceExact(i));
@@ -277,10 +277,10 @@ private void assertEquals(SortedSetDocValues docs, long[][] ordinalPlan) throws
             long[] ords = ordinalPlan[doc];
             assertEquals(ords.length > 0, docs.advanceExact(doc));
             if (ords.length > 0) {
+                assertEquals(ords.length, docs.docValueCount());
                 for (long ord : ords) {
                     assertThat(docs.nextOrd(), equalTo(ord));
                 }
-                assertThat(docs.nextOrd(), equalTo((long) SortedSetDocValues.NO_MORE_DOCS));
             }
         }
     }