diff --git a/ipatests/test_ipalib/test_rpc.py b/ipatests/test_ipalib/test_rpc.py
index f03895123..ae83a5d10 100644
--- a/ipatests/test_ipalib/test_rpc.py
+++ b/ipatests/test_ipalib/test_rpc.py
@@ -257,7 +257,7 @@ class test_xmlclient(PluginTester):
 
 class test_xml_introspection(object):
     @classmethod
-    def setup_class(self):
+    def setup_class(cls):
         try:
             api.Backend.xmlclient.connect()
         except (errors.NetworkError, IOError):
@@ -265,7 +265,7 @@ class test_xml_introspection(object):
                                 (__name__, api.env.xmlrpc_uri))
 
     @classmethod
-    def teardown_class(self):
+    def teardown_class(cls):
         request.destroy_context()
 
     def test_list_methods(self):
diff --git a/pylintrc b/pylintrc
index 102d2d85e..115b295a2 100644
--- a/pylintrc
+++ b/pylintrc
@@ -59,7 +59,6 @@ disable=
     unused-argument,
     unused-variable,
     useless-else-on-loop,
-    bad-classmethod-argument,
     bad-continuation,
     bad-mcs-classmethod-argument,
     bad-mcs-method-argument,