diff --git a/autotools/check-python-code b/autotools/check-python-code
index 166e12db184eea50a574afb6ccbc0601b14ce182..051ef71e6058502631b677ef13cb96b4a29be39a 100755
--- a/autotools/check-python-code
+++ b/autotools/check-python-code
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 
-# Copyright (C) 2009 Google Inc.
+# Copyright (C) 2009, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,9 @@
 
 set -e
 
+# Ensure the checks always use the same locale
+export LC_ALL=C
+
 readonly maxlinelen=$(for ((i=0; i<81; ++i)); do echo -n .; done)
 
 if [[ "${#maxlinelen}" != 81 ]]; then
@@ -58,6 +61,13 @@ for script; do
     let ++problems
     echo "Longest line in $script is longer than 80 characters" >&2
   fi
+
+  if grep -n -H -E -i \
+    '#.*\bpylint[[:space:]]*:[[:space:]]*disable-msg\b' "$script"
+  then
+    let ++problems
+    echo "Found old-style pylint disable pragma in $script" >&2
+  fi
 done
 
 if [[ "$problems" -gt 0 ]]; then
diff --git a/test/ganeti.asyncnotifier_unittest.py b/test/ganeti.asyncnotifier_unittest.py
index 5fdaf56c2af6befc55c6f4481bee0cb647a43e07..9acb60cf310b0b02eee9df1ddeaa4fc7fb6b10cc 100755
--- a/test/ganeti.asyncnotifier_unittest.py
+++ b/test/ganeti.asyncnotifier_unittest.py
@@ -28,7 +28,7 @@ import tempfile
 import shutil
 
 try:
-  # pylint: disable-msg=E0611
+  # pylint: disable=E0611
   from pyinotify import pyinotify
 except ImportError:
   import pyinotify