diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 0d0157ae77..ed167e6a51 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -585,11 +585,15 @@ public void searchInChangeNumberModeOnOneSuffixMultipleTimes() throws Exception
     // write 4 changes starting from changenumber 1, and search them
     String testName = "Multiple/1";
     CSN[] csns = generateAndPublishUpdateMsgForEachOperationType(testName, false);
+    // Wait until changenumber 4 is visible before searching
+    assertChangelogAttributesInRootDSE(1, 4);
     searchChangesForEachOperationTypeUsingChangeNumberMode(1, csns, testName);
 
     // write 4 more changes starting from changenumber 5, and search them
     testName = "Multiple/5";
     csns = generateAndPublishUpdateMsgForEachOperationType(testName, false);
+    // Wait until changenumber 8 is visible before searching
+    assertChangelogAttributesInRootDSE(1, 8);
     searchChangesForEachOperationTypeUsingChangeNumberMode(5, csns, testName);
 
     // search from the provided change number: 6 (should be the add msg)