diff --git a/.gitignore b/.gitignore
index 35e8b939..cb78e40b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
 budget/budget.db
+budget.db
 budget/memory
 budget/settings.py
 *.pyc
 *.egg-info
 dist
 .venv
+docs/_build/
+.tox
+dist
diff --git a/Makefile b/Makefile
index cb2a1c7f..1ac7e197 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ serve: $(INSTALL_STAMP)
 	cd budget; ../$(PYTHON) run.py
 
 test: $(DEV_STAMP)
-	cd budget; ../$(PYTHON) tests.py
+	$(VENV)/bin/tox
 
 release: $(DEV_STAMP)
 	$(VENV)/bin/fullrelease
diff --git a/dev-requirements.txt b/dev-requirements.txt
index a7fbb05b..0bbb0aa0 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1 +1,2 @@
 zest.releaser
+tox
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 00000000..8982892c
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,3 @@
+docutils<0.13
+Sphinx
+sphinx_rtd_theme
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..d15f51b5
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,20 @@
+[tox]
+envlist = py35,py27,docs
+skip_missing_interpreters = True
+
+[testenv]
+
+passenv = TRAVIS
+commands =
+    python --version
+    python budget/tests.py
+deps =
+    -rdev-requirements.txt
+    -rrequirements.txt
+
+install_command = pip install --pre {opts} {packages}
+
+[testenv:docs]
+commands = sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html
+deps =
+    -rdocs/requirements.txt