diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java
index 7ba41fd7cc242..7f08a562ce51b 100644
--- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java
+++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java
@@ -88,6 +88,8 @@ public void testClientConnecting() throws Exception {
     server.shutdown();
     server.awaitTermination(1, TimeUnit.SECONDS);
     server.shutdownNow();
+    Thread.sleep(1000); // Wait for stub to close stream.
+
     verify(requestObserver).onCompleted();
     verifyNoMoreInteractions(requestObserver);
   }
@@ -126,6 +128,8 @@ public void testMultipleClientsConnecting() throws Exception {
     server.shutdown();
     server.awaitTermination(1, TimeUnit.SECONDS);
     server.shutdownNow();
+    Thread.sleep(1000); // Wait for stub to close stream.
+
     verify(requestObserver).onCompleted();
     verifyNoMoreInteractions(requestObserver);
     verify(anotherRequestObserver).onCompleted();