diff --git a/.travis.yml b/.travis.yml
index e273e358d..0b55cda19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: xenial
 branches:
   only:
     - master
-    - http2  # Remove once merged into master
+    - http2  # ToDo: Remove once merged into master
     - /^\d\.\d+$/
     - /^\d\.\d+\.\d+(rc\d+|\.dev\d+)?$/
 matrix:
diff --git a/setup.py b/setup.py
index 7f4ff0095..c8733ae96 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ install_requires = [
     'protego>=0.1.15',
     'itemadapter>=0.1.0',
     'h2>=3.2.0',
+    'typing-extensions>=3.7',
 ]
 extras_require = {}
 
diff --git a/tox.ini b/tox.ini
index e8fdbd85d..3bf2224ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ deps =
     -ctests/constraints.txt
     -rtests/requirements-py3.txt
     # Extras
+    Twisted[http2]>=17.9.0
     boto3>=1.13.0
     botocore>=1.3.23
     Pillow>=3.4.2
@@ -64,6 +65,7 @@ deps =
     -ctests/constraints.txt
     cryptography==2.0
     cssselect==0.9.1
+    h2==3.2.0
     itemadapter==0.1.0
     parsel==1.5.0
     Protego==0.1.15
@@ -72,12 +74,12 @@ deps =
     queuelib==1.4.2
     service_identity==16.0.0
     Twisted[http2]==17.9.0
+    typing-extensions==3.7
     w3lib==1.17.0
     zope.interface==4.1.3
     -rtests/requirements-py3.txt
     # Extras
     botocore==1.3.23
-    h2==3.2.0
     google-cloud-storage==1.29.0
     Pillow==3.4.2