diff --git a/tools/hacking.sh b/tools/hacking.sh
new file mode 100755
index 00000000..967902bb
--- /dev/null
+++ b/tools/hacking.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+flake8 barbicanclient | tee flake8.log
+exit ${PIPESTATUS[0]}
diff --git a/tox.ini b/tox.ini
index e61c7277..2fd33e05 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27
+envlist = py26, py27, pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -18,7 +18,7 @@ deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
 
 [testenv:pep8]
-commands = flake8
+commands = {toxinidir}/tools/hacking.sh
 
 [testenv:venv]
 commands = {posargs}