diff --git a/.travis.yml b/.travis.yml
index d4c4841..8565b35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 python:
   - 2.7
-  - 3.4
   - 3.5
   - 3.6
 sudo: false
@@ -15,3 +14,6 @@ notifications:
       - readthedocs:y3hjODOi7EIz1JAbD1Zb41sz#random
     on_success: change
     on_failure: always
+branches:
+  only:
+  - master
diff --git a/tox.ini b/tox.ini
index cf32e34..4b13dd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
 envlist =
-    py{27,34,35,36}
-    lint
-    docs
+    py{27,35,36}-sphinx{16,17,18},
+    # Workaround https://github.com/tox-dev/tox/issues/706
+    lint-sphinx18
+    docs-sphinx18
 
 [tox:travis]
-2.7 = py27, docs, #lint
-3.4 = py34
-3.5 = py35
-3.6 = py36
+2.7 = py27-sphinx{16,17,18}, docs-sphinx16, lint-sphinx16
+3.5 = py35-sphinx{16,17,18}
+3.6 = py36-sphinx{16,17,18}
 
 [testenv]
 setenv =
@@ -16,7 +16,9 @@ setenv =
 deps =
     .
     pytest
-    sphinx<1.7
+    sphinx16: Sphinx < 1.7
+    sphinx17: Sphinx < 1.8
+    sphinx18: Sphinx < 1.9
 commands =
     py.test {posargs}