diff --git a/test/integration/plugins/test_quota.py b/test/integration/plugins/test_quota.py
index 1ae6790597a..afafc238abc 100644
--- a/test/integration/plugins/test_quota.py
+++ b/test/integration/plugins/test_quota.py
@@ -54,6 +54,14 @@ class TestQuota(cloudstackTestCase):
                         ]
         return
 
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            cleanup_resources(cls.apiclient, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
     def setUp(self):
         self.apiclient = self.testClient.getApiClient()
         self.hypervisor = self.testClient.getHypervisorInfo()