diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py
index 8808034142d..68902f5fbf9 100644
--- a/test/integration/component/test_affinity_groups.py
+++ b/test/integration/component/test_affinity_groups.py
@@ -340,7 +340,7 @@ class TestListAffinityGroups(cloudstackTestCase):
         try:
             cls.api_client = super(TestListAffinityGroups, cls).getClsTestClient().getApiClient()
             #Clean up, terminate the created templates
-            cleanup_resources(cls.api_client, cls.__cleanup)
+            cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
 
@@ -587,7 +587,7 @@ class TestDeleteAffinityGroups(cloudstackTestCase):
         try:
             cls.api_client = super(TestDeleteAffinityGroups, cls).getClsTestClient().getApiClient()
             #Clean up, terminate the created templates
-            cleanup_resources(cls.api_client, cls.__cleanup)
+            cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
 
@@ -857,7 +857,7 @@ class TestUpdateVMAffinityGroups(cloudstackTestCase):
         try:
             cls.api_client = super(TestUpdateVMAffinityGroups, cls).getClsTestClient().getApiClient()
             #Clean up, terminate the created templates
-            cleanup_resources(cls.api_client, cls.__cleanup)
+            cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
 
@@ -1141,7 +1141,7 @@ class TestDeployVMAffinityGroups(cloudstackTestCase):
         try:
             cls.api_client = super(TestDeployVMAffinityGroups, cls).getClsTestClient().getApiClient()
             #Clean up, terminate the created templates
-            cleanup_resources(cls.api_client, cls.__cleanup)
+            cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
 
@@ -1489,7 +1489,7 @@ class TestAffinityGroupsAdminUser(cloudstackTestCase):
         try:
             cls.api_client = super(TestAffinityGroupsAdminUser, cls).getClsTestClient().getApiClient()
             #Clean up, terminate the created templates
-            cleanup_resources(cls.api_client, cls.__cleanup)
+            cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)