diff --git a/tools/flakes.py b/tools/flakes.py
new file mode 100644
index 0000000000..7ebe10cec7
--- /dev/null
+++ b/tools/flakes.py
@@ -0,0 +1,22 @@
+import __builtin__
+import os
+import sys
+
+from pyflakes.scripts.pyflakes import main
+
+"""
+ wrapper for pyflakes to ignore gettext based warning:
+     "undefined name '_'"
+
+ From https://bugs.launchpad.net/pyflakes/+bug/844592
+"""
+
+names = os.environ.get('PYFLAKES_BUILTINS', '_')
+names = [x.strip() for x in names.split(',')]
+for x in names:
+    if not hasattr(__builtin__, x):
+        setattr(__builtin__, x, True)
+
+del names, os, __builtin__
+
+sys.exit(main())
diff --git a/tox.ini b/tox.ini
index 16959d621e..ebbaf2173d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,6 +35,10 @@ deps = -r{toxinidir}/tools/pip-requires
        pylint==0.26.0
 commands = bash tools/lintstack.sh
 
+[testenv:pyflakes]
+deps = pyflakes
+commands = python tools/flakes.py nova
+
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1