diff --git a/.travis.yml b/.travis.yml
index 1ceeb38..9a601c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,9 @@
 language: python
-python:
-  - '2.6'
-  - '2.7'
-  - '3.3'
-  - '3.4'
-  - '3.5'
-  - '3.6'
-  - nightly
-
 install:
-  - pip install 'pytest>=2.8' coveralls
+  - pip install 'pytest>=2.8' tox coveralls
 
 script:
-  - python setup.py test
+  - tox
 
 after_success:
   - coveralls
diff --git a/tox.ini b/tox.ini
index 0be23d8..4581cbe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,13 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py36
+envlist =
+    py26
+    py27
+    py33
+    py34
+    py35
+    py36
 skip_missing_interpreters = True
 skipsdist = True