diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index 04777b0c2a8..33c43059334 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime
 
 
diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py
index a532b362751..14b6dacaa96 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -807,13 +807,11 @@ class TestAssociatePublicIp(cloudstackTestCase):
         try:
 
             self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
-
-           SshClient(
-                        portableip.ipaddress.ipaddress,
-                        self.services['natrule']["publicport"],
-                        self.virtual_machine.username,
-                        self.virtual_machine.password
-                        )
+            SshClient(portableip.ipaddress.ipaddress,
+                      self.services['natrule']["publicport"],
+                      self.virtual_machine.username,
+                      self.virtual_machine.password
+                      )
         except Exception as e:
             self.fail("Exception while SSHing : %s" % e)
 
@@ -1532,13 +1530,11 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
         try:
 
             self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
-
-           SshClient(
-                        portableip.ipaddress.ipaddress,
-                        self.services['natrule']["publicport"],
-                        self.virtual_machine2.username,
-                        self.virtual_machine2.password
-                        )
+            SshClient(portableip.ipaddress.ipaddress,
+                      self.services['natrule']["publicport"],
+                      self.virtual_machine2.username,
+                      self.virtual_machine2.password
+                      )
         except Exception as e:
             self.fail("Exception while SSHing : %s" % e)
 
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index c90ccf6ee28..8e0739658ae 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -656,12 +656,11 @@ class TestRevokeIngressRule(cloudstackTestCase):
         # SSH Attempt to VM should fail
         with self.assertRaises(Exception):
             self.debug("SSH into VM: %s" % self.virtual_machine.id)
-           SshClient(
-                                        self.virtual_machine.ssh_ip,
-                                        self.virtual_machine.ssh_port,
-                                        self.virtual_machine.username,
-                                        self.virtual_machine.password
-                                        )
+            SshClient(self.virtual_machine.ssh_ip,
+                      self.virtual_machine.ssh_port,
+                      self.virtual_machine.username,
+                      self.virtual_machine.password
+                    )
         return
 
 
diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py
index e52a893587c..a1bf1ba2f50 100644
--- a/test/integration/component/test_snapshot_limits.py
+++ b/test/integration/component/test_snapshot_limits.py
@@ -21,7 +21,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import is_snapshot_on_nfs
 import os
 
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index 5a5c2981e2f..2586c0ba765 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -22,7 +22,6 @@ import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py
index bae5acf5514..194ba977090 100644
--- a/test/integration/component/test_storage_motion.py
+++ b/test/integration/component/test_storage_motion.py
@@ -20,7 +20,6 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index af86d32a3bd..91de9b3ea64 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -24,7 +24,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import urllib
 from random import random
 #Import System modules
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index 9f5e6f623f0..c918f54043d 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime
 # For more info on ddt refer to http://ddt.readthedocs.org/en/latest/api.html#module-ddt
 from ddt import ddt, data
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index 8ed99ca3c36..a83662740db 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime
 
 
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index cc65eedff8a..36905143260 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 from marvin.codes import PASS
 
 import time
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index ebf3b317d2b..c4811ed98cd 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime