1 files changed, 14 insertions, 12 deletions
diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java
index 72a6392248..ce1b3ef57f 100644
--- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java
+++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java
@@ -122,24 +122,26 @@ public class StreamCloseTest extends AbstractTest
             {
                 MetaData.Response metaData = new MetaData.Response(HttpVersion.HTTP_2, 200, new HttpFields());
                 HeadersFrame response = new HeadersFrame(stream.getId(), metaData, null, false);
-                stream.headers(response, Callback.NOOP);
+                Callback.Completable completable = new Callback.Completable();
+                stream.headers(response, completable);
                 return new Stream.Listener.Adapter()
                 {
                     @Override
                     public void onData(final Stream stream, DataFrame frame, final Callback callback)
                     {
                         Assert.assertTrue(((HTTP2Stream)stream).isRemotelyClosed());
-                        stream.data(frame, new Callback()
-                        {
-                            @Override
-                            public void succeeded()
-                            {
-                                Assert.assertTrue(stream.isClosed());
-                                Assert.assertEquals(0, stream.getSession().getStreams().size());
-                                callback.succeeded();
-                                serverDataLatch.countDown();
-                            }
-                        });
+                        completable.thenRun(() ->
+                                stream.data(frame, new Callback()
+                                {
+                                    @Override
+                                    public void succeeded()
+                                    {
+                                        Assert.assertTrue(stream.isClosed());
+                                        Assert.assertEquals(0, stream.getSession().getStreams().size());
+                                        callback.succeeded();
+                                        serverDataLatch.countDown();
+                                    }
+                                }));
                     }
                 };
             }