--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/http2/NoBody.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8161157
+ * @library /lib/testlibrary server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common
+ *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
+ *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,frames,errors NoBody
+ */
+
+import java.io.IOException;
+import java.net.URI;
+import jdk.incubator.http.HttpClient;
+import jdk.incubator.http.HttpRequest;
+import jdk.incubator.http.HttpResponse;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLParameters;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import jdk.testlibrary.SimpleSSLContext;
+import static jdk.incubator.http.HttpClient.Version.HTTP_2;
+import static jdk.incubator.http.HttpRequest.BodyProcessor.fromString;
+import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+
+import org.testng.annotations.Test;
+
+public class NoBody {
+
+    static final String SIMPLE_STRING = "Hello world. Goodbye world";
+
+    @Test(timeOut=60000)
+    public void test() throws Exception {
+        SSLContext sslContext = (new SimpleSSLContext()).get();
+        ExecutorService exec = Executors.newCachedThreadPool();
+        HttpClient client = HttpClient.newBuilder()
+                                      .executor(exec)
+                                      .sslContext(sslContext)
+                                      .version(HTTP_2)
+                                      .build();
+
+        Http2TestServer httpsServer = null;
+        try {
+            httpsServer = new Http2TestServer(true,
+                                              0,
+                                              exec,
+                                              sslContext);
+            httpsServer.addHandler(new NoBodyHandler(), "/");
+
+            int httpsPort = httpsServer.getAddress().getPort();
+            String httpsURIString = "https://127.0.0.1:" + httpsPort + "/bar/";
+
+            httpsServer.start();
+            URI uri = URI.create(httpsURIString);
+            System.err.println("Request to " + uri);
+
+            HttpRequest req = HttpRequest.newBuilder(uri)
+                                         .PUT(fromString(SIMPLE_STRING))
+                                         .build();
+            HttpResponse<String> response = client.send(req, asString());
+            String body = response.body();
+            if (!body.equals(""))
+                throw new RuntimeException("expected empty body");
+            System.err.println("DONE");
+        } finally {
+            if (httpsServer != null )  { httpsServer.stop(); }
+            exec.shutdownNow();
+        }
+    }
+}