diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
index 75c8a39..7c6a4f6 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventHandlerTest.java
@@ -586,15 +586,20 @@
     @Override
     public void run() {
       try {
-        testBarrier.await();
         idLocks
             .withLock(
                 task,
                 () ->
                     runLater(
                         INDEX_WAIT_TIMEOUT_MS * 2,
-                        () -> CompletableFuture.completedFuture(successFunc.get())),
-                failureFunc)
+                        () -> {
+                          await();
+                          return CompletableFuture.completedFuture(successFunc.get());
+                        }),
+                () -> {
+                  await();
+                  failureFunc.invoke();
+                })
             .whenComplete(
                 (v, t) -> {
                   if (t == null) {
@@ -609,6 +614,14 @@
       }
     }
 
+    private void await() {
+      try {
+        testBarrier.await();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     public void join() {
       try {
         future.join();