diff --git a/tools/fast8.sh b/tools/fast8.sh
new file mode 100755
index 0000000000..2b3e22abda
--- /dev/null
+++ b/tools/fast8.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+cd $(dirname "$0")/..
+CHANGED=$(git diff --name-only HEAD~1 | tr '\n' ' ')
+
+# Skip files that don't exist
+# (have been git rm'd)
+CHECK=""
+for FILE in $CHANGED; do
+    if [ -f "$FILE" ]; then
+        CHECK="$CHECK $FILE"
+    fi
+done
+
+diff -u --from-file /dev/null $CHECK | flake8 --diff
diff --git a/tox.ini b/tox.ini
index 69786c861c..d1f612a652 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,6 +55,10 @@ commands = python setup.py build_sphinx
 [testenv:cover]
 commands = {toxinidir}/tools/cover.sh {posargs}
 
+[testenv:fast8]
+commands =
+  {toxinidir}/tools/fast8.sh
+
 [testenv:pylint]
 deps = -r{toxinidir}/requirements.txt
        pylint==0.26.0