diff --git a/tools/fast8.sh b/tools/fast8.sh
new file mode 100755
index 000000000..2b3e22abd
--- /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 ced4dc95f..6dfa126d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,12 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 whitelist_externals = ostestr
 
+[testenv:fast8]
+# Use same environment directory as pep8 env to save space and install time
+envdir = {toxworkdir}/pep8
+commands =
+  {toxinidir}/tools/fast8.sh
+
 [testenv:pep8]
 commands =
     flake8