diff --git a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java
index 3e381a61cf7..ce6d8fcf286 100644
--- a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java
+++ b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java
@@ -179,6 +179,13 @@ public abstract class AbstractServerReplicationTestSetUp<ReplicableInterface ext
              * original exception propagate */
             logger.log(Level.SEVERE, "Exception trying to connect to initial load test servlet to STOP it", ex);
         }
+        synchronized (replicaReplicator.getReplicator()) {
+            while (!replicaReplicator.getReplicator().isQueueEmpty()) {
+                logger.info("Waiting for replication queue to drain...");
+                replicaReplicator.getReplicator().wait();
+            }
+        }
+        logger.info("Replication queue has been drained...");
     }
     
     /**