diff --git a/.travis.yml b/.travis.yml
index f0366db..d66429c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,10 @@ install:
   - sudo npm install -g sass@0.5.0 requirejs@2.1 stylus@0.51 uglify-js@2.4.23 less@2.5.1
 
   # Python test requirements
-  - pip install -r dev-req.txt
+  - pip install tox
 
 before_script:
   - export PYTHONPATH=$PYTHONPATH:/usr/share/asciidoc/
 
 script:
-  # Source code sanity check
-  - flake8 hyde
-  # Run Python tests and generate coverage statistics
-  - nosetests
+  - tox
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..ecede01
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,19 @@
+[tox]
+envlist = py27,pep8
+
+[testenv]
+usedevelop = True
+# Needed for asciidoc
+sitepackages = True
+# Needed for asciidoc
+passenv = PYTHONPATH
+deps = -r{toxinidir}/dev-req.txt
+commands = nosetests
+
+[testenv:pep8]
+deps = flake8
+commands = flake8
+
+[flake8]
+exclude = .tox
+show-source = true