diff --git a/.gitignore b/.gitignore
index b278d33cc..cf172c670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 mp-virtualenv
 .idea
 .*deps
+.tox
 mailpile.egg-info/
 mailpile-tmp.py
 mailpile/www/default/config.codekit
diff --git a/.travis.yml b/.travis.yml
index 9f032644a..a93214dfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
 language: python
-python:
-  - "2.7"
+python: 2.7
+env:
+  - TOX_ENV=py27
+
 before_install:
   - sudo apt-get update
-  - sudo apt-get install gnupg
+  - sudo apt-get install -y gnupg
+
 install:
-  - pip install -r requirements.txt --use-mirrors
-  - pip install coverage coveralls nose --use-mirrors
+  - pip install tox coveralls
+
 script:
-  - "python setup.py install"
-  - "nosetests mailpile.tests --with-coverage --cover-package=mailpile"
-after_success:
-  - "coveralls"
+  - tox -e $TOX_ENV
 
+after_success:
+  - coveralls
diff --git a/test-requirements.txt b/test-requirements.txt
index f82d5ba74..1216d56c3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,3 +2,4 @@ selenium>=2.40.0
 mock>=1.0.1
 coverage
 nose
+tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..c98d438c8
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py27
+
+[testenv]
+VIRTUAL_ENV={envdir}
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = nosetests {toxinidir}/mailpile/tests --with-coverage --cover-package=mailpile