diff --git a/.travis.yml b/.travis.yml
index 92ee7eddb..e2c6acb51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,15 @@ matrix:
         - python: 3.4
         - python: 3.5
         - python: 3.6
-        - python: 3.6
 
 install:
     - pip install --requirement requirements.txt
-
+    - pip install sphinx
 script:
     - cd src/
     - pytest --cov
     - pycodestyle
+    - sphinx-build -b html ../docs ../docs/_build -W
 
 after_success:
     - coveralls
diff --git a/docs/conf.py b/docs/conf.py
index ec7ac4bdf..7cf8c9fe1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -40,7 +40,7 @@ extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
-    'sphinx.ext.pngmath',
+    'sphinx.ext.imgmath',
     'sphinx.ext.viewcode',
 ]
 
diff --git a/src/setup.cfg b/src/setup.cfg
index e70395525..1112934c0 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -1,5 +1,5 @@
 [pycodestyle]
-exclude = migrations, paperless/settings.py
+exclude = migrations, paperless/settings.py, .tox
 
 
 [tool:pytest]
diff --git a/src/tox.ini b/src/tox.ini
new file mode 100644
index 000000000..98e44e063
--- /dev/null
+++ b/src/tox.ini
@@ -0,0 +1,22 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+skipsdist = True
+envlist = py34, py35, py36, pycodestyle, doc
+
+[testenv]
+commands = pytest
+deps = -r{toxinidir}/../requirements.txt
+
+[testenv:pycodestyle]
+commands=pycodestyle
+deps=pycodestyle
+
+[testenv:doc]
+deps =
+  -r{toxinidir}/../requirements.txt
+  sphinx
+commands=sphinx-build -b html ../docs ../docs/_build -W