diff --git a/.travis.yml b/.travis.yml
index 60504e769..77494ca59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,30 @@
 sudo: required
 dist: trusty
 language: python
-python: 3.6
+matrix:
+  include:
+  - python: 2.6
+    env: TOXENV=py26
+  - python: 2.7
+    env: TOXENV=py27
+  - python: 3.3
+    env: TOXENV=py33
+  - python: 3.4
+    env: TOXENV=py34
+  - python: 3.5
+    env: TOXENV=py35
+  - python: 3.6
+    env: TOXENV=py36
+  - python: 3.7-dev
+    env: TOXENV=py37-dev
+  - python: pypy2.7-5.8.0
+    env: TOXENV=pypy
+  - python: pypy3.5-5.8.0
+    env: TOXENV=pypy3
+  - python: 3.6
+    env: TOXENV=flake8
+  - python: 2.7
+    env: TOXENV=perf
 
 # use cache for big builds like pandas
 cache:
@@ -18,20 +41,6 @@ notifications:
 #     - master
 #     - /^\d\.\d+$/
 
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=py36
-  - TOXENV=pypy
-  # TODO: re-enable when Travis is fixed
-  # - TOXENV=pypy3
-  - TOXENV=pypy3.3-5.2-alpha1
-  - TOXENV=flake8
-  - TOXENV=perf
-
 before_install:
   # fix a crash with multiprocessing on Travis
   - sudo rm -rf /dev/shm
diff --git a/tox.ini b/tox.ini
index 1c6a496bf..f78ecc09f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,8 @@
 # and then run "tox" from this directory.
 
 [tox]
-# deprecation warning: py26, py33
-envlist = py32, py33, py34, py26, py27, py35, py36, pypy, pypy3, pypy3.3-5.2-alpha1, flake8, setup.py, perf
+# deprecation warning: py26, py32-4
+envlist = py26, py27, py33, py34, py35, py36, py37-dev, pypy, pypy3, flake8, setup.py, perf
 
 [testenv]
 # default tests (most things)
@@ -22,7 +22,7 @@ commands =
     nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_perf\.py" -d -v tqdm/
     - coveralls
 
-# no cython/numpy/pandas for pypy/pypy3/py26/py33
+# no cython/numpy/pandas for pypy/pypy3/py26/py33/py37-dev
 [testenv:pypy]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
@@ -30,8 +30,9 @@ deps =
     nose-timer
     coverage<4
     coveralls
+    virtualenv>=15.0.2
 commands =
-    nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_p(erf|andas)\.py" -d -v tqdm/
+    nosetests --with-coverage --cover-package=tqdm --ignore-files="tests_p(erf|andas)\.py" -d -v tqdm/  # TODO: --with-timer
     - coveralls
 
 [testenv:pypy3]
@@ -41,22 +42,21 @@ deps =
 commands =
     {[testenv:pypy]commands}
 
-[testenv:pypy3.3-5.2-alpha1]
+[testenv:py26]
 passenv = {[testenv:pypy]passenv}
 deps =
     {[testenv:pypy]deps}
-    virtualenv>=15.0.2
 commands =
     {[testenv:pypy]commands}
 
-[testenv:py26]
+[testenv:py33]
 passenv = {[testenv:pypy]passenv}
 deps =
     {[testenv:pypy]deps}
 commands =
     {[testenv:pypy]commands}
 
-[testenv:py33]
+[testenv:py37-dev]
 passenv = {[testenv:pypy]passenv}
 deps =
     {[testenv:pypy]deps}