diff --git a/tools/flakes.py b/tools/flakes.py
new file mode 100644
index 00000000000..4b93abc2109
--- /dev/null
+++ b/tools/flakes.py
@@ -0,0 +1,22 @@
+"""
+ wrapper for pyflakes to ignore gettext based warning:
+     "undefined name '_'"
+
+ From https://bugs.launchpad.net/pyflakes/+bug/844592
+"""
+import __builtin__
+import os
+import sys
+
+from pyflakes.scripts.pyflakes import main
+
+if __name__ == "__main__":
+    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 e766f16357f..936ba66a453 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,3 +44,7 @@ commands = /bin/bash run_tests.sh -N --coverage-xml
 [testenv:jenkinsvenv]
 setenv = NOSE_WITH_XUNIT=1
 commands = {posargs}
+
+[testenv:pyflakes]
+deps = pyflakes
+commands = python tools/flakes.py cinder