diff --git a/trove/extensions/security_group/models.py b/trove/extensions/security_group/models.py
index 17e2699c50..8eba7e0237 100644
--- a/trove/extensions/security_group/models.py
+++ b/trove/extensions/security_group/models.py
@@ -89,7 +89,7 @@ class SecurityGroup(DatabaseModelBase):
         return sec_group
 
     @classmethod
-    def get_security_group_by_id_or_instance_id(self, id, tenant_id):
+    def get_security_group_by_id_or_instance_id(cls, id, tenant_id):
         try:
             return SecurityGroup.find_by(id=id,
                                          tenant_id=tenant_id,
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py
index 28931b0381..83ecbbe304 100644
--- a/trove/guestagent/datastore/mysql_common/service.py
+++ b/trove/guestagent/datastore/mysql_common/service.py
@@ -641,7 +641,7 @@ class BaseMySqlApp(object):
             {MySQLConfParser.SERVER_CONF_SECTION: {'datadir': value}})
 
     @classmethod
-    def get_client_auth_file(self):
+    def get_client_auth_file(cls):
         return guestagent_utils.build_file_path("~", ".my.cnf")
 
     def __init__(self, status, local_sql_client, keep_alive_connection_cls):
diff --git a/trove/tests/fakes/swift.py b/trove/tests/fakes/swift.py
index bb3c50ea24..23b360fb35 100644
--- a/trove/tests/fakes/swift.py
+++ b/trove/tests/fakes/swift.py
@@ -37,7 +37,7 @@ class FakeSwiftClient(object):
         pass
 
     @classmethod
-    def Connection(self, *args, **kargs):
+    def Connection(cls, *args, **kargs):
         LOG.debug("fake FakeSwiftClient Connection")
         return FakeSwiftConnection()
 
diff --git a/trove/tests/unittests/guestagent/test_cassandra_manager.py b/trove/tests/unittests/guestagent/test_cassandra_manager.py
index 24affccc57..1e9c423452 100644
--- a/trove/tests/unittests/guestagent/test_cassandra_manager.py
+++ b/trove/tests/unittests/guestagent/test_cassandra_manager.py
@@ -332,11 +332,11 @@ class GuestAgentCassandraDBManagerTest(DatastoreManagerTest):
             models.CassandraUser(self._get_random_name(65536))
 
     @classmethod
-    def _serialize_collection(self, *collection):
+    def _serialize_collection(cls, *collection):
         return [item.serialize() for item in collection]
 
     @classmethod
-    def _get_random_name(self, size,
+    def _get_random_name(cls, size,
                          chars=string.ascii_letters + string.digits):
         return ''.join(random.choice(chars) for _ in range(size))