diff --git a/test/integration/broken/test_vpc_vm_life_cycle.py b/test/integration/broken/test_vpc_vm_life_cycle.py
index 9290835c2e6..c1868d009f9 100644
--- a/test/integration/broken/test_vpc_vm_life_cycle.py
+++ b/test/integration/broken/test_vpc_vm_life_cycle.py
@@ -19,7 +19,7 @@ from nose.plugins.attrib import attr
 from component.test_vpc_vm_life_cycle import Services
 
 
-class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
+class TestVMLifeCycleSharedNwVPC(cloudstackTesTODOtCase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/test/integration/component/test_host_ha.py b/test/integration/component/test_host_ha.py
index e6dd20bfe6b..d32e708b081 100644
--- a/test/integration/component/test_host_ha.py
+++ b/test/integration/component/test_host_ha.py
@@ -17,19 +17,22 @@
 """ BVT tests for Hosts Maintenance
 """
 
+# Import Local Modules
+from marvin.codes import FAILED
 from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
 from marvin.lib.utils import *
 from marvin.lib.base import *
 from marvin.lib.common import *
 from nose.plugins.attrib import attr
 
+from time import sleep
+
 _multiprocess_shared_ = False
 
 
 class TestHostHA(cloudstackTestCase):
 
-    hostCountMsg = "Host HA can be tested with at least two hosts, only %s found"
-
     def setUp(self):
         self.logger = logging.getLogger('TestHM')
         self.stream_handler = logging.StreamHandler()
@@ -83,8 +86,17 @@ class TestHostHA(cloudstackTestCase):
                          "timeout": 10,
                          }
 
+
     def tearDown(self):
-        super(TestHostHA, self).tearDown()
+        try:
+            # Clean up, terminate the created templates
+            cleanup_resources(self.apiclient, self.cleanup)
+
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+
+        return
+
 
     def createVMs(self, hostId, number, local):
 
@@ -307,9 +319,11 @@ class TestHostHA(cloudstackTestCase):
         for host in listHost:
             self.logger.debug('Hypervisor = {}'.format(host.id))
 
-        if len(listHost) < 2:
-            self.logger.debug(self.hostCountMsg % len(listHost))
-            raise unittest.SkipTest(self.hostCountMsg % len(listHost))
+
+        if len(listHost) != 2:
+            self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost))
+            raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost))
+
 
         no_of_vms = self.noOfVMsOnHost(listHost[0].id)
 
@@ -317,6 +331,7 @@ class TestHostHA(cloudstackTestCase):
 
         self.logger.debug("Number of VMS on hosts = %s" % no_of_vms)
 
+
         if no_of_vms < 5:
             self.logger.debug("test_01: Create VMs as there are not enough vms to check host ha")
             no_vm_req = 5 - no_of_vms
@@ -381,9 +396,10 @@ class TestHostHA(cloudstackTestCase):
         for host in listHost:
             self.logger.debug('Hypervisor = {}'.format(host.id))
 
-        if len(listHost) < 2:
-            self.logger.debug(self.hostCountMsg % len(listHost))
-            raise unittest.SkipTest(self.hostCountMsg % len(listHost))
+
+        if len(listHost) != 2:
+            self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost))
+            raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost))
 
         no_of_vms = self.noOfVMsOnHost(listHost[0].id)
 
@@ -457,9 +473,10 @@ class TestHostHA(cloudstackTestCase):
         for host in listHost:
             self.logger.debug('Hypervisor = {}'.format(host.id))
 
-        if len(listHost) < 2:
-            self.logger.debug(self.hostCountMsg % len(listHost))
-            raise unittest.SkipTest(self.hostCountMsg % len(listHost))
+
+        if len(listHost) != 2:
+            self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost))
+            raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost))
 
         no_of_vms = self.noOfVMsOnHost(listHost[0].id)
 
@@ -531,9 +548,10 @@ class TestHostHA(cloudstackTestCase):
         for host in listHost:
             self.logger.debug('Hypervisor = {}'.format(host.id))
 
-        if len(listHost) < 2:
-            self.logger.debug(self.hostCountMsg % len(listHost))
-            raise unittest.SkipTest(self.hostCountMsg % len(listHost))
+
+        if len(listHost) != 2:
+            self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost))
+            raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost))
 
         no_of_vms = self.noOfVMsOnHost(listHost[0].id)
 
@@ -541,6 +559,7 @@ class TestHostHA(cloudstackTestCase):
 
         self.logger.debug("Number of VMS on hosts = %s" % no_of_vms)
 
+
         if no_of_vms < 5:
             self.logger.debug("test_01: Create VMs as there are not enough vms to check host ha")
             no_vm_req = 5 - no_of_vms
diff --git a/test/integration/component/test_rootvolume_resize.py b/test/integration/component/test_rootvolume_resize.py
index 7e58d1e3f42..1b1a6fe6db1 100644
--- a/test/integration/component/test_rootvolume_resize.py
+++ b/test/integration/component/test_rootvolume_resize.py
@@ -773,7 +773,7 @@ class TestResizeVolume(cloudstackTestCase):
         return
 
     @attr(tags=["advanced"], required_hardware="true")
-    def test_05_vmdeployment_with_size(self):
+    def test_5_vmdeployment_with_size(self):
         """Test vm deployment with new rootdisk size parameter
 
         # Validate the following
@@ -855,7 +855,7 @@ class TestResizeVolume(cloudstackTestCase):
 
 
     @attr(tags=["advanced"], required_hardware="true")
-    def test_06_resized_rootvolume_with_lessvalue(self):
+    def test_6_resized_rootvolume_with_lessvalue(self):
         """Test resize root volume with less than original volume size
 
         # Validate the following
@@ -939,7 +939,7 @@ class TestResizeVolume(cloudstackTestCase):
 
     # @attr(tags=["advanced"], required_hrdware="true")
     @attr(tags=["TODO"], required_hrdware="true")
-    def test_07_usage_events_after_rootvolume_resized_(self):
+    def test_7_usage_events_after_rootvolume_resized_(self):
         """Test check usage events after root volume resize
 
         # Validate the following