diff --git a/.travis.yml b/.travis.yml
index 502ba13..0f7f5ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,10 @@ python:
     - "2.7"
     - "3.3"
     - "3.4"
+    - "3.5"
 env:
-    - TORNADO_VERSION=3.1.1
-    - TORNADO_VERSION=4.0.2
+    - TORNADO_VERSION=3.2.2
+    - TORNADO_VERSION=4.4.2
 install:
     - "pip install -r requirements.txt"
     - "pip install tornado>=$TORNADO_VERSION"
diff --git a/setup.py b/setup.py
index 559a757..6187277 100644
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,7 @@ def run_tests(self):
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Topic :: Software Development :: Libraries :: Application Frameworks",
     ]
 )
diff --git a/tox.ini b/tox.ini
index a478be2..9b028d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = {py27,py35}-tornado{311,402}
+envlist = {py27,py35}-tornado{3,4}
 
 [testenv]
 deps=
     pytest
     pytest-cov
-    tornado311: tornado==3.1.1
-    tornado402: tornado>=4.0.2
+    tornado3: tornado==3.2.2
+    tornado4: tornado>=4.4.2
     jsonschema
 
 commands=