--- a/jdk/test/java/net/httpclient/http2/server/Http2TestServerConnection.java	Mon Feb 13 11:35:00 2017 -0500
+++ b/jdk/test/java/net/httpclient/http2/server/Http2TestServerConnection.java	Mon Feb 13 17:18:48 2017 +0000
@@ -392,9 +392,11 @@
         //System.err.println ("Stream window size = " + winsize);
 
         final InputStream bis;
-        if (endStreamReceived) {
+        if (endStreamReceived && queue.size() == 0) {
+            System.err.println("Server: got END_STREAM for stream " + streamid);
             bis = NullInputStream.INSTANCE;
         } else {
+            System.err.println("Server: creating input stream for stream " + streamid);
             bis = new BodyInputStream(queue, streamid, this);
         }
         try (bis;