diff --git a/test/test_protocol_http2.py b/test/test_protocol_http2.py
new file mode 100644
index 000000000..17b8506d0
--- /dev/null
+++ b/test/test_protocol_http2.py
@@ -0,0 +1,117 @@
+from __future__ import (absolute_import, print_function, division)
+
+import inspect
+import socket
+from io import BytesIO
+
+import logging
+logging.getLogger("hyper.packages.hpack.hpack").setLevel(logging.WARNING)
+
+import netlib
+from netlib import tservers as netlib_tservers
+
+import h2
+
+from libmproxy import utils
+from . import tservers
+
+class SimpleHttp2Server(netlib_tservers.ServerTestBase):
+    ssl = dict(
+        alpn_select=b'h2',
+    )
+
+    class handler(netlib.tcp.BaseHandler):
+        def handle(self):
+            h2_conn = h2.connection.H2Connection(client_side=False)
+
+            preamble = self.rfile.read(24)
+            h2_conn.initiate_connection()
+            h2_conn.receive_data(preamble)
+            self.wfile.write(h2_conn.data_to_send())
+            self.wfile.flush()
+
+            while True:
+                events = h2_conn.receive_data(utils.http2_read_frame(self.rfile))
+                self.wfile.write(h2_conn.data_to_send())
+                self.wfile.flush()
+
+                for event in events:
+                    if isinstance(event, h2.events.RequestReceived):
+                        h2_conn.send_headers(1, [
+                            (':status', '200'),
+                            ('foo', 'bar'),
+                        ])
+                        h2_conn.send_data(1, b'foobar')
+                        h2_conn.end_stream(1)
+                        self.wfile.write(h2_conn.data_to_send())
+                        self.wfile.flush()
+                    elif isinstance(event, h2.events.ConnectionTerminated):
+                        return
+
+
+class TestHttp2(tservers.ProxTestBase):
+    def _setup_connection(self):
+        self.config.http2 = True
+
+        client = netlib.tcp.TCPClient(("127.0.0.1", self.proxy.port))
+        client.connect()
+
+        # send CONNECT request
+        client.wfile.write(
+            b"CONNECT localhost:%d HTTP/1.1\r\n"
+            b"Host: localhost:%d\r\n"
+            b"\r\n" % (self.server.port, self.server.port)
+        )
+        client.wfile.flush()
+
+        # read CONNECT response
+        while client.rfile.readline() != "\r\n":
+            pass
+
+        client.convert_to_ssl(alpn_protos=[b'h2'])
+
+        h2_conn = h2.connection.H2Connection(client_side=True)
+        h2_conn.initiate_connection()
+        client.wfile.write(h2_conn.data_to_send())
+        client.wfile.flush()
+
+        return client, h2_conn
+
+    def _send_request(self, wfile, h2_conn, stream_id=1, headers=[], end_stream=True):
+        h2_conn.send_headers(
+            stream_id=stream_id,
+            headers=headers,
+            end_stream=end_stream,
+        )
+        wfile.write(h2_conn.data_to_send())
+        wfile.flush()
+
+    def test_simple(self):
+        self.server = SimpleHttp2Server()
+        self.server.setup_class()
+
+        client, h2_conn = self._setup_connection()
+
+        self._send_request(client.wfile, h2_conn, headers=[
+            (':authority', "127.0.0.1:%s" % self.server.port),
+            (':method', 'GET'),
+            (':scheme', 'https'),
+            (':path', '/'),
+        ])
+
+        done = False
+        while not done:
+            events = h2_conn.receive_data(utils.http2_read_frame(client.rfile))
+            client.wfile.write(h2_conn.data_to_send())
+            client.wfile.flush()
+
+            for event in events:
+                if isinstance(event, h2.events.StreamEnded):
+                    done = True
+
+        self.server.teardown_class()
+
+        assert len(self.master.state.flows) == 1
+        assert self.master.state.flows[0].response.status_code == 200
+        assert self.master.state.flows[0].response.headers['foo'] == 'bar'
+        assert self.master.state.flows[0].response.body == b'foobar'