diff --git a/test/integration/smoke/test_usage_events.py b/test/integration/smoke/test_usage_events.py
index 0c08fecdc69..abd54ae9b64 100644
--- a/test/integration/smoke/test_usage_events.py
+++ b/test/integration/smoke/test_usage_events.py
@@ -63,10 +63,7 @@ class TestUsageEvents(cloudstackTestCase):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            cleanup_resources(cls.apiclient, cls._cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
+        super(TestUsageEvents,self).tearDownClass()
 
     def setUp(self):
         self.apiclient = self.testClient.getApiClient()
@@ -81,13 +78,9 @@ class TestUsageEvents(cloudstackTestCase):
         self.cleanup.append(self.account)
 
     def tearDown(self):
-        try:
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestUsageEvents,self).tearDown()
 
-    @attr(tags=["advanced, basic"], required_hardware="true")
+    @attr(tags=["advanced", "basic"], required_hardware="true")
     def test_01_positive_tests_usage(self):
         """ Check events in usage_events table when VM creation fails