diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java
index 447ce0bb49..2292a0ab84 100644
--- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java
+++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/GracefulStopDocTest.java
@@ -5,14 +5,12 @@ package jdocs.akka.typed;
 
 //#imports
 
+import java.util.concurrent.TimeUnit;
+
 import akka.actor.typed.ActorSystem;
 import akka.actor.typed.Behavior;
 import akka.actor.typed.PostStop;
 import akka.actor.typed.javadsl.Behaviors;
-import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
-
-import java.util.concurrent.TimeUnit;
 
 //#imports
 
@@ -85,7 +83,7 @@ public class GracefulStopDocTest {
 
     system.tell(new JobControl.GracefulShutdown());
 
-    Await.result(system.whenTerminated(), Duration.create(3, TimeUnit.SECONDS));
+    system.getWhenTerminated().toCompletableFuture().get(3, TimeUnit.SECONDS);
     //#graceful-shutdown
   }
 
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java
index ee3af3e274..efcf9b0e5d 100644
--- a/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java
+++ b/akka-actor-typed-tests/src/test/java/jdocs/akka/typed/IntroTest.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
-import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
 
 public class IntroTest {
 
@@ -230,7 +228,7 @@ public class IntroTest {
     final ActorSystem<Void> system =
       ActorSystem.create(main, "ChatRoomDemo");
 
-    Await.result(system.whenTerminated(), Duration.create(3, TimeUnit.SECONDS));
+    system.getWhenTerminated().toCompletableFuture().get();
     //#chatroom-main
   }
 
diff --git a/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java b/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
index 5228c0a173..7b6f7bf5fa 100644
--- a/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
+++ b/akka-docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
@@ -1,6 +1,5 @@
 package jdocs.cluster;
 
-
 import java.util.concurrent.TimeUnit;
 import scala.concurrent.Await;
 import scala.concurrent.duration.Duration;
@@ -55,7 +54,7 @@ public class FactorialFrontendMain {
         new Thread() {
           @Override public void run(){
             try {
-              Await.ready(system.whenTerminated(), Duration.create(10, TimeUnit.SECONDS));
+              system.getWhenTerminated().toCompletableFuture().get(10, TimeUnit.SECONDS);
             } catch (Exception e) {
               System.exit(-1);
             }