diff --git a/.travis.yml b/.travis.yml
index 347751f..c63d152 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,29 +6,26 @@ env:
   - TOXENV=py26-dj14
   - TOXENV=py26-dj15
   - TOXENV=py26-dj16
-  - TOXENV=py26-dj17
-  - TOXENV=py26-dj18
+  - TOXENV=pypy-dj14
+  - TOXENV=pypy-dj15
+  - TOXENV=pypy-dj16
   - TOXENV=py27-dj14
   - TOXENV=py27-dj15
   - TOXENV=py27-dj16
   - TOXENV=py27-dj17
   - TOXENV=py27-dj18
-  - TOXENV=py32-dj14
   - TOXENV=py32-dj15
   - TOXENV=py32-dj16
   - TOXENV=py32-dj17
   - TOXENV=py32-dj18
-  - TOXENV=py33-dj14
   - TOXENV=py33-dj15
   - TOXENV=py33-dj16
   - TOXENV=py33-dj17
   - TOXENV=py33-dj18
-  - TOXENV=py34-dj14
   - TOXENV=py34-dj15
   - TOXENV=py34-dj16
   - TOXENV=py34-dj17
   - TOXENV=py34-dj18
-  - TOXENV=pypy-dj14
   - TOXENV=pypy-dj15
   - TOXENV=pypy-dj16
   - TOXENV=pypy-dj17
diff --git a/tox.ini b/tox.ini
index be4e384..310f521 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,19 @@ envlist =
     coverage-py27-dj16,
     flake8-py27,
     flake8-py33,
-    py{26,27,32,33,34,py}-dj{14,15,16,17,18}
+    py{26,py}-dj{14,15,16},
+    py27-dj{14,15,16,17,18},
+    py{32,33,34,py}-dj{15,16,17,18}
 
 [testenv]
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py32: python3.2
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
+usedevelop = true
 deps =
     django-discover-runner
     mock