diff --git a/akka-stream-tests/src/test/java/akka/stream/javadsl/LazyAndFutureSourcesTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/LazyAndFutureSourcesTest.java
index 820a93fbb6..5e39ae4f34 100644
--- a/akka-stream-tests/src/test/java/akka/stream/javadsl/LazyAndFutureSourcesTest.java
+++ b/akka-stream-tests/src/test/java/akka/stream/javadsl/LazyAndFutureSourcesTest.java
@@ -4,7 +4,6 @@
 
 package akka.stream.javadsl;
 
-import akka.Done;
 import akka.NotUsed;
 import akka.japi.Pair;
 import akka.stream.StreamTest;
@@ -60,7 +59,9 @@ public class LazyAndFutureSourcesTest extends StreamTest {
     CompletionStage<NotUsed> nestedMatVal = result.first();
     CompletionStage<List<String>> list = result.second();
     assertEquals(Arrays.asList("one"), list.toCompletableFuture().get(3, TimeUnit.SECONDS));
-    assertEquals(true, nestedMatVal.toCompletableFuture().isDone());
+    // Future adaption to completionstage of matval means we cannot count on matval future being
+    // completed just because stream is
+    nestedMatVal.toCompletableFuture().get(3, TimeUnit.SECONDS);
   }
 
   @Test
@@ -87,7 +88,9 @@ public class LazyAndFutureSourcesTest extends StreamTest {
     CompletionStage<NotUsed> nestedMatVal = result.first();
     CompletionStage<List<String>> list = result.second();
     assertEquals(Arrays.asList("one"), list.toCompletableFuture().get(3, TimeUnit.SECONDS));
-    assertEquals(true, nestedMatVal.toCompletableFuture().isDone());
+    // Future adaption to completionstage of matval means we cannot count on matval future being
+    // completed just because stream is
+    nestedMatVal.toCompletableFuture().get(3, TimeUnit.SECONDS);
   }
 
   @Test
@@ -101,6 +104,8 @@ public class LazyAndFutureSourcesTest extends StreamTest {
     CompletionStage<NotUsed> nestedMatVal = result.first();
     CompletionStage<List<String>> list = result.second();
     assertEquals(Arrays.asList("one"), list.toCompletableFuture().get(3, TimeUnit.SECONDS));
-    assertEquals(true, nestedMatVal.toCompletableFuture().isDone());
+    // flatMap/thenCompose of matval means we cannot count on matval future being completed just
+    // because stream is
+    nestedMatVal.toCompletableFuture().get(3, TimeUnit.SECONDS);
   }
 }