diff --git a/.travis.yml b/.travis.yml
index d457b9ff0..db211c140 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,17 @@ python:
   - 3.3
   - 3.4
   - 3.5
-  - nightly
+  - 3.6
+  - 3.7
   - pypy
   - pypy3
 
 before_install:
   - SED_GET_PY='s/[^0-9]//g;s/.//3g;2s/.*/py/;1!G;h;$!d;s/y.2./y/;s/y.3./y3/'
   - PY=$(python -V 2>&1 | sed "$SED_GET_PY")
-  - test $PY == 32 && TOX='virtualenv<14 tox' || TOX=tox
+  - TOX=tox
+  - test $PY != 32 || TOX='virtualenv<14 tox<3'
+  - test $PY != 33 -a $PY != 26 || TOX='virtualenv<15.2 tox<3'
   - export TOXENV=py$PY
 
 install:
@@ -26,7 +29,3 @@ script:
 
 notifications:
     email: false
-
-matrix:
-    allow_failures:
-      - python: nightly
diff --git a/tox.ini b/tox.ini
index a016a1848..586d9241a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,12 +3,12 @@ envlist = py{37,36,35,34,33,32,27,26,py3,py}
 
 [testenv]
 deps = pytest-cov
-       pytest-timeout
+       py{37,36,35,27,py3,py}: pytest-timeout
+       py{34,33,26}: pytest-timeout<1.2.1
        py26: unittest2
        py32: coverage<4
+       py{33,26}: pytest<3.3
        py32: pytest<3
-       py26: pytest<3.3
-       py33: pytest<3.3
 commands = py.test {posargs}
 
 [pytest]