diff --git a/tox.ini b/tox.ini
index ded5dc6f..ce26b9ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,25 @@
+# TODO(ib-lundgren): Fix this, it's ugly...
 [tox]
-envlist = py26,py27
-[testenv]
+envlist = py26,py27,py31,py32,py33
+[testenv:py26]
 deps=nose
      unittest2
      pycrypto
 commands=nosetests
+[testenv:py27]
+deps=nose
+     unittest2
+     pycrypto
+commands=nosetests
+[testenv:py31]
+deps=nose
+     pycrypto
+commands=nosetests
+[testenv:py32]
+deps=nose
+     pycrypto
+commands=nosetests
+[testenv:py33]
+deps=nose
+     pycrypto
+commands=nosetests