diff --git a/Makefile b/Makefile
index 7da53ecae..4ce9cc35b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: install clean test retest coverage docs
 
 install:
-	pip install -e .[docs,test,async]
+	pip install -e .[docs,test,async,tornado]
 	pip install bumpversion twine wheel
 
 lint:
diff --git a/setup.py b/setup.py
index 057773a6e..9fa1c1558 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 ]
 
 tornado_require = [
-    'tornado>=4.0.2'
+    'tornado>=4.0.2,<5'
 ]
 
 async_require = []  # see below
diff --git a/tox.ini b/tox.ini
index 9b3d9e589..48ac5758c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,11 +4,12 @@ envlist = py27,py33,py34,py35,py36,pypy
 
 [testenv]
 extras = 
-    test 
+    test
     xmlsec
     py{35,36}: async
+    py{35,36}: tornado
 deps = 
-    py{35,36}: aioresponses==0.1.3
+    py{35,36}: aioresponses==0.4.1
     py{35,36}: pytest-asyncio==0.5.0
 commands = coverage run --parallel -m pytest {posargs}