diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java
index bc39aef77d..5729e2d419 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java
+++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/NullEmptyStateTest.java
@@ -90,6 +90,8 @@ public class NullEmptyStateTest extends JUnitSuite {
     ActorRef<String> ref1 = testKit.spawn(b);
     probe.expectMessage("onRecoveryCompleted:null");
     ref1.tell("stop");
+    // wait till ref1 stops
+    probe.expectTerminated(ref1);
 
     ActorRef<String> ref2 = testKit.spawn(b);
     probe.expectMessage("onRecoveryCompleted:null");
@@ -99,6 +101,8 @@ public class NullEmptyStateTest extends JUnitSuite {
     probe.expectMessage("eventHandler:one:two");
 
     ref2.tell("stop");
+    // wait till ref2 stops
+    probe.expectTerminated(ref2);
     ActorRef<String> ref3 = testKit.spawn(b);
     // eventHandler from reply
     probe.expectMessage("eventHandler:null:one");