diff --git a/.travis.yml b/.travis.yml
index 4abdf9e..b8f718d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: python
 python:
-  - "2.7"
+  - TOX_ENV=py26
+  - TOX_ENV=py27
+  - TOX_ENV=docs
+  - TOX_ENV=flake8
 install:
   - pip install tox pytest
 script: 
diff --git a/tox.ini b/tox.ini
index 0b94756..a92be76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,43 +1,34 @@
 [tox]
-minversion=1.3
+minversion = 1.3
 envlist = py26,py27
-#,py27
-#,py27,py32
-#,py27,py32
-addopts = --ignore=setup.py --ignore=.tox --ignore=setuptools --ignore=third
 
-[pytest]
-rsyncdirs = scripts
-rsyncignore = .hg third
-addopts = -v -v
+  - TOX_ENV=py26
+  - TOX_ENV=py27
+  - TOX_ENV=docs
+  - TOX_ENV=flake8
 
-[testenv:docs]
-downloadcache={toxworkdir}/downloadcache
-basepython=python
-changedir=doc
-deps=sphinx
-commands=
-    sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
-
-[tools]
-downloadcache={toxworkdir}/downloadcache
-testing=
-deps=
 
 [testenv]
-downloadcache={toxworkdir}/downloadcache
-distribute=True
-sitepackages=False
 deps=
     pytest
-
 commands=
-    py.test src
-#nosetests
+    nosetests
 
 [testenv:py26]
+
+[testenv:py27]
+
+[testenv:docs]
 downloadcache={toxworkdir}/downloadcache
-deps=
-    unittest2
+basepython=python2.7
+changedir=doc
+deps=sphinx
 commands=
-    py.test src
\ No newline at end of file
+    sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
+
+[testenv:flake8]
+basepython=python2.7
+deps=flake8
+commands=
+    flake8 djohno
+