diff --git a/pavelib/quality.py b/pavelib/quality.py
index 887b0997a8..ad617bf17f 100644
--- a/pavelib/quality.py
+++ b/pavelib/quality.py
@@ -30,7 +30,9 @@ def run_pylint(options):
         # This makes the folder if it doesn't already exist.
         report_dir = (Env.REPORT_DIR / system).makedirs_p()
 
-        flags = '-E' if errors else ''
+        flags = ["--disable=fixme"]
+        if errors:
+            flags.append("--errors-only")
 
         apps = [system]
 
@@ -51,7 +53,7 @@ def run_pylint(options):
             "{pythonpath_prefix} pylint {flags} -f parseable {apps} | "
             "tee {report_dir}/pylint.report".format(
                 pythonpath_prefix=pythonpath_prefix,
-                flags=flags,
+                flags=" ".join(flags),
                 apps=apps_list,
                 report_dir=report_dir
             )
diff --git a/pylintrc b/pylintrc
index 1d4902e732..21966c7f8a 100644
--- a/pylintrc
+++ b/pylintrc
@@ -41,8 +41,7 @@ disable=
 # W0142: Used * or ** magic
 # R0921: Abstract class not referenced
 # R0922: Abstract class is only referenced 1 times
-# W0511: TODO comments
-    I0011,C0301,W0141,W0142,R0921,R0922,W0511,
+    I0011,C0301,W0141,W0142,R0921,R0922,
 
 # Django makes classes that trigger these
 # W0232: Class has no __init__ method