diff --git a/docs/develop/env.rst b/docs/develop/env.rst
index dd3a315c95..88347a942e 100644
--- a/docs/develop/env.rst
+++ b/docs/develop/env.rst
@@ -50,6 +50,11 @@ Setup for Nailgun Unit Tests
     cd nailgun
     ./run_tests.sh --no-jslint --no-ui-tests
 
+#. Run the Nailgun flake8 test::
+
+    cd nailgun
+    ./run_tests.sh --flake8
+
 Setup for Web UI Tests
 ----------------------
 
diff --git a/nailgun/run_tests.sh b/nailgun/run_tests.sh
index abc4bc3de8..d81de12dd3 100755
--- a/nailgun/run_tests.sh
+++ b/nailgun/run_tests.sh
@@ -4,12 +4,12 @@ function usage {
   echo "Usage: $0 [OPTION]..."
   echo "Run tests"
   echo ""
-  echo "  -p, --flake8               Just run flake8 and HACKING compliance check"
+  echo "  -p, --flake8             Just run flake8 and HACKING compliance check"
   echo "  -f, --fail-first         Nosetests will stop on first error"
   echo "  -j, --jslint             Just run JSLint"
   echo "  -u, --ui-tests           Just run UI tests"
   echo "  -x, --xunit              Generate reports (useful in Jenkins environment)"
-  echo "  -P, --no-flake8            Don't run static code checks"
+  echo "  -P, --no-flake8          Don't run static code checks"
   echo "  -J, --no-jslint          Don't run JSLint"
   echo "  -U, --no-ui-tests        Don't run UI tests"
   echo "  -c, --clean              Only clean *.log, *.json, *.pyc, *.pid files, doesn't run tests"