diff --git a/src/tox.ini b/src/tox.ini
new file mode 100644
index 000000000..962e39a19
--- /dev/null
+++ b/src/tox.ini
@@ -0,0 +1,23 @@
+# 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, pep8
+
+[testenv]
+commands = {envpython} manage.py test
+deps = -r{toxinidir}/../requirements.txt
+setenv =
+    PAPERLESS_CONSUME=/tmp/paperless/consume
+    PAPERLESS_PASSPHRASE=THISISNOTASECRET
+    PAPERLESS_SECRET=paperless
+
+[testenv:pep8]
+commands=pep8
+deps=pep8
+
+[pep8]
+exclude=.tox,migrations,paperless/settings.py
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 360385de8..000000000
--- a/tox.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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]
-#envlist = py34, py35
-
-#[testenv]
-#commands = {envpython} src/manage.py test
-#deps =
-
-[pep8]
-exclude=migrations,src/paperless/settings.py