diff --git a/.travis.yml b/.travis.yml
index 8dca164..918183f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,13 @@
+sudo: false
 language: python
 install:
-  - pip install tox
+  - pip install tox-travis
   - pip install 'virtualenv<14.0.0'
 script:
   - tox
 python:
-  - 3.5
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
diff --git a/setup.py b/setup.py
index e413aaf..86da25f 100755
--- a/setup.py
+++ b/setup.py
@@ -79,6 +79,7 @@ def get_version(package):
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     test_suite='tests',
     tests_require=test_requirements
diff --git a/tox.ini b/tox.ini
index 4fb2b6c..86a2d04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{27,33,34,35},coverage
+    py{27,33,34,35,36},coverage
 
 [testenv]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
@@ -9,6 +9,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 deps =
     mock
     requests