diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 7b2edf48caabc987ba867bb69b7c028212da011a..6efb1713ddb48c2921f015f067d079f56c03b279 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -37,7 +37,7 @@ import shutil
 import socket
 import StringIO
 try:
-  import affinity
+  import affinity   # pylint: disable=F0401
 except ImportError:
   affinity = None
 
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 0d4f29ab338bf7ee7301a56bc8c2e280350a7c1f..0f3f008e44dd16c762ad1d45cf1b833014ce0827 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -952,7 +952,7 @@ class R_2_instances_name_replace_disks(baserlib.OpcodeResource):
     except KeyError:
       pass
     else:
-      if not ht.TListOf(ht.TInt)(raw_disks): # pylint: disable-msg=E1102
+      if not ht.TListOf(ht.TInt)(raw_disks): # pylint: disable=E1102
         # Backwards compatibility for strings of the format "1, 2, 3"
         try:
           data["disks"] = [int(part) for part in raw_disks.split(",")]