diff -r 1ad58e0cbf16 -r 7133f144981a jdk/test/java/net/httpclient/http2/RedirectTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/httpclient/http2/RedirectTest.java	Fri Dec 09 11:35:02 2016 +0000
@@ -0,0 +1,170 @@
+/*
+ * 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 8156514
+ * @key intermittent
+ * @library /lib/testlibrary server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common
+ * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.frame
+ * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @run testng/othervm -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors RedirectTest
+ */
+
+import java.net.*;
+import jdk.incubator.http.*;
+import static jdk.incubator.http.HttpClient.Version.HTTP_2;
+import java.nio.file.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.Arrays;
+import java.util.Iterator;
+import static jdk.incubator.http.HttpRequest.BodyProcessor.fromString;
+import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+
+import org.testng.annotations.Test;
+
+@Test
+public class RedirectTest {
+    static int httpPort, altPort;
+    static Http2TestServer httpServer, altServer;
+    static HttpClient client;
+    static ExecutorService exec;
+
+    static String httpURIString, altURIString1, altURIString2;
+
+    static Supplier<String> sup(String... args) {
+        Iterator<String> i = Arrays.asList(args).iterator();
+        // need to know when to stop calling it.
+        return () -> i.next();
+    }
+
+    static void initialize() throws Exception {
+        try {
+            client = getClient();
+            httpServer = new Http2TestServer(false, 0, exec, null);
+
+            httpPort = httpServer.getAddress().getPort();
+            altServer = new Http2TestServer(false, 0, exec, null);
+            altPort = altServer.getAddress().getPort();
+
+            // urls are accessed in sequence below
+            // first two on different servers. Third on same server
+            // as second. So, the client should use the same http connection
+            httpURIString = "http://127.0.0.1:" + httpPort + "/foo/";
+            altURIString1 = "http://127.0.0.1:" + altPort + "/redir";
+            altURIString2 = "http://127.0.0.1:" + altPort + "/redir/again";
+
+            httpServer.addHandler(new RedirectHandler(sup(altURIString1)), "/foo");
+            altServer.addHandler(new RedirectHandler(sup(altURIString2)), "/redir");
+            altServer.addHandler(new EchoHandler(), "/redir/again");
+
+            httpServer.start();
+            altServer.start();
+        } catch (Throwable e) {
+            System.err.println("Throwing now");
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    @Test(timeOut=3000000)
+    public static void test() throws Exception {
+        try {
+            initialize();
+            simpleTest();
+        } catch (Throwable tt) {
+            System.err.println("tt caught");
+            tt.printStackTrace();
+        } finally {
+            httpServer.stop();
+            altServer.stop();
+            exec.shutdownNow();
+        }
+    }
+
+    static HttpClient getClient() {
+        if (client == null) {
+            exec = Executors.newCachedThreadPool();
+            client = HttpClient.newBuilder()
+                               .executor(exec)
+                               .followRedirects(HttpClient.Redirect.ALWAYS)
+                               .version(HTTP_2)
+                               .build();
+        }
+        return client;
+    }
+
+    static URI getURI() {
+        return URI.create(httpURIString);
+    }
+
+    static void checkStatus(int expected, int found) throws Exception {
+        if (expected != found) {
+            System.err.printf ("Test failed: wrong status code %d/%d\n",
+                expected, found);
+            throw new RuntimeException("Test failed");
+        }
+    }
+
+    static void checkStrings(String expected, String found) throws Exception {
+        if (!expected.equals(found)) {
+            System.err.printf ("Test failed: wrong string %s/%s\n",
+                expected, found);
+            throw new RuntimeException("Test failed");
+        }
+    }
+
+    static Void compareFiles(Path path1, Path path2) {
+        return TestUtil.compareFiles(path1, path2);
+    }
+
+    static Path tempFile() {
+        return TestUtil.tempFile();
+    }
+
+    static final String SIMPLE_STRING = "Hello world Goodbye world";
+
+    static final int FILESIZE = 64 * 1024 + 200;
+
+    static void simpleTest() throws Exception {
+        URI uri = getURI();
+        System.err.println("Request to " + uri);
+
+        HttpClient client = getClient();
+        HttpRequest req = HttpRequest.newBuilder(uri)
+                                     .POST(fromString(SIMPLE_STRING))
+                                     .build();
+        CompletableFuture<HttpResponse<String>> cf = client.sendAsync(req, asString());
+        HttpResponse<String> response = cf.join();
+
+        checkStatus(200, response.statusCode());
+        String responseBody = response.body();
+        checkStrings(SIMPLE_STRING, responseBody);
+
+        System.err.println("DONE");
+        Thread.sleep (6000);
+    }
+}