diff --git a/.gitignore b/.gitignore
index dd77799..62103ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,9 @@
 *.pyc
 *_flymake
 .coverage
-.sass-cache/
 .ropeproject/
+.sass-cache/
+.tox/
 nose.cfg
 MANIFEST
 _build/
diff --git a/.travis.yml b/.travis.yml
index 7493fd0..61eb826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
     - "2.7"
-    - "2.6"
+    - "3.3"
 before_install:
     # Dependencies to build PIL
     - sudo apt-get update -qq
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..c313f00
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,14 @@
+[tox]
+envlist = py27,py33
+
+[testenv]
+commands = py.test
+deps =
+
+[testenv:py27]
+deps =
+    pytest
+
+[testenv:py33]
+deps =
+    pytest