diff --git a/.travis.yml b/.travis.yml
index 2d6fae6..73d28df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ python:
 sudo: false
 matrix:
   include:
-    - python: 2.7
-      script: tox -e docs
-    - python: 2.7
-      script: tox -e lint
+    - python: 3.6
+      env: TOXENV=docs
+    - python: 3.6
+      env: TOXENV=lint
 install:
   - pip install tox-travis
 script:
diff --git a/tox.ini b/tox.ini
index c8cac6a..5baaa46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,16 @@
 [tox]
 envlist =
-    py{27,34,35}-sphinx{14,15}
+    py{27,34,35,36}-sphinx{13,14,15}
     lint
     docs
 
+[travis]
+python =
+    2.7: py27
+    3.4: py34
+    3.5: py35
+    3.6: py36
+
 [testenv]
 setenv =
     LANG=C
@@ -12,12 +19,13 @@ deps = -r{toxinidir}/requirements.txt
     mock
     sphinx14: Sphinx<1.5
     sphinx15: Sphinx<1.6
+    sphinx16: Sphinx<1.7
 commands =
     py.test {posargs}
 
 [testenv:docs]
 deps =
-    Sphinx==1.5
+    Sphinx==1.6
     sphinx_rtd_theme
 changedir = {toxinidir}/docs
 commands =
@@ -30,4 +38,4 @@ commands =
     prospector \
     --profile-path={toxinidir} \
     --profile=prospector \
-    --die-on-tool-error
+    --die-on-tool-error {posargs}