diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
index 6ad44ec1..008d6749 100644
--- a/docs/source/quickstart.rst
+++ b/docs/source/quickstart.rst
@@ -135,8 +135,8 @@ Using ``hyper`` with requests is super simple::
     >>> import requests
     >>> from hyper.contrib import HTTP20Adapter
     >>> s = requests.Session()
-    >>> s.mount('https://http2bin.org', HTTP20Adapter())
-    >>> r = s.get('https://http2bin.org/get')
+    >>> s.mount('https://', HTTP20Adapter())
+    >>> r = s.get('https://httpbin.org/get')
     >>> print(r.status_code)
     200
 
diff --git a/hyper/common/headers.py b/hyper/common/headers.py
index 655a591a..b2990ddb 100644
--- a/hyper/common/headers.py
+++ b/hyper/common/headers.py
@@ -5,12 +5,16 @@
 
 Contains hyper's structures for storing and working with HTTP headers.
 """
-import collections
+try:
+    from collections.abc import MutableMapping
+except ImportError:  # pragma: no cover
+    # Python 2.7 compatibility
+    from collections import MutableMapping
 
 from hyper.common.util import to_bytestring, to_bytestring_tuple
 
 
-class HTTPHeaderMap(collections.MutableMapping):
+class HTTPHeaderMap(MutableMapping):
     """
     A structure that contains HTTP headers.
 
diff --git a/hyper/http11/connection.py b/hyper/http11/connection.py
index 4311d307..b7162dc3 100644
--- a/hyper/http11/connection.py
+++ b/hyper/http11/connection.py
@@ -10,9 +10,12 @@
 import socket
 import base64
 
-from collections import Iterable, Mapping
+try:
+    from collections.abc import Iterable, Mapping
+except ImportError:  # pragma: no cover
+    # Python 2.7 compatibility
+    from collections import Iterable, Mapping
 
-import collections
 from hyperframe.frame import SettingsFrame
 
 from .response import HTTP11Response
@@ -390,7 +393,7 @@ def _send_body(self, body, body_type):
                 return
 
             # Iterables that set a specific content length.
-            elif isinstance(body, collections.Iterable):
+            elif isinstance(body, Iterable):
                 for item in body:
                     try:
                         self._sock.send(item)
diff --git a/hyper/http20/connection.py b/hyper/http20/connection.py
index b8be292b..d2805a09 100644
--- a/hyper/http20/connection.py
+++ b/hyper/http20/connection.py
@@ -403,7 +403,7 @@ def _connect_upgrade(self, sock):
         with self._conn as conn:
             conn.initiate_upgrade_connection()
             conn.update_settings(
-                {h2.settings.ENABLE_PUSH: int(self._enable_push)}
+                {h2.settings.SettingCodes.ENABLE_PUSH: int(self._enable_push)}
             )
         self._send_outstanding_data()
 
@@ -424,7 +424,7 @@ def _send_preamble(self):
         with self._conn as conn:
             conn.initiate_connection()
             conn.update_settings(
-                {h2.settings.ENABLE_PUSH: int(self._enable_push)}
+                {h2.settings.SettingCodes.ENABLE_PUSH: int(self._enable_push)}
             )
         self._send_outstanding_data()
 
diff --git a/hyper/tls.py b/hyper/tls.py
index 422b001c..39fa8e88 100644
--- a/hyper/tls.py
+++ b/hyper/tls.py
@@ -122,8 +122,8 @@ def init_context(cert_path=None, cert=None, cert_password=None):
 
     if cert is not None:
         try:
-            basestring
-        except NameError:
+            from builtins import basestring
+        except ImportError:
             basestring = (str, bytes)
         if not isinstance(cert, basestring):
             context.load_cert_chain(cert[0], cert[1], cert_password)
diff --git a/test/test_hyper.py b/test/test_hyper.py
index b826c63c..df30ee70 100644
--- a/test/test_hyper.py
+++ b/test/test_hyper.py
@@ -766,7 +766,8 @@ def test_incrementing_window_after_close(self):
         # the default max frame size (16,384 bytes). That will, on the third
         # frame, trigger the processing to increment the flow control window,
         # which should then not happen.
-        f = SettingsFrame(0, settings={h2.settings.INITIAL_WINDOW_SIZE: 100})
+        f = SettingsFrame(0, settings={
+            h2.settings.SettingCodes.INITIAL_WINDOW_SIZE: 100})
 
         c = HTTP20Connection('www.google.com')
         c._sock = DummySocket()
diff --git a/test_requirements.txt b/test_requirements.txt
index cae2fbc6..e0941764 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1,5 +1,5 @@
 pytest>=3.0
-pytest-xdist
+pytest-xdist<=1.27.0
 pytest-cov
 requests
 mock