diff --git a/plugin_test/helpers/settings.py b/plugin_test/helpers/settings.py
index a59ec0e..ffed8f0 100644
--- a/plugin_test/helpers/settings.py
+++ b/plugin_test/helpers/settings.py
@@ -45,8 +45,8 @@ NSXT_USER = os.environ.get('NSXT_USER')
 assigned_networks = {
     iface_alias('eth0'): ['fuelweb_admin', 'private'],
     iface_alias('eth1'): ['public'],
-    iface_alias('eth2'): ['storage'],
-    iface_alias('eth4'): ['management']
+    iface_alias('eth2'): ['management'],
+    iface_alias('eth4'): ['storage']
 }
 
 cluster_settings = {
diff --git a/plugin_test/tests/test_plugin_nsxt.py b/plugin_test/tests/test_plugin_nsxt.py
index 4d11b3e..7c58135 100644
--- a/plugin_test/tests/test_plugin_nsxt.py
+++ b/plugin_test/tests/test_plugin_nsxt.py
@@ -95,7 +95,7 @@ class TestNSXtSmoke(TestNSXtBase):
           groups=["nsxt_smoke"])
     @log_snapshot_after_test
     def nsxt_smoke(self):
-        """Deploy a cluster with NSXt Plugin.
+        """Deploy cluster with NSXt Plugin and compute node.
 
         Scenario:
             1. Upload the plugin to master node.
@@ -147,7 +147,7 @@ class TestNSXtBVT(TestNSXtBase):
           groups=["nsxt_bvt"])
     @log_snapshot_after_test
     def nsxt_bvt(self):
-        """Deploy cluster with plugin and vmware datastore backend.
+        """Deploy ha cluster with plugin and KVM + vCenter.
 
         Scenario:
             1. Upload plugins to the master node.
@@ -157,7 +157,7 @@ class TestNSXtBVT(TestNSXtBase):
                 * controller
                 * controller
                 * compute-vmware + cinder-vmware
-                * compute
+                * compute + cinder
             4. Configure vcenter.
             5. Configure NSXt for that cluster.
             6. Deploy cluster.
diff --git a/plugin_test/tests/test_plugin_scale.py b/plugin_test/tests/test_plugin_scale.py
index 42c43c8..882fe5c 100644
--- a/plugin_test/tests/test_plugin_scale.py
+++ b/plugin_test/tests/test_plugin_scale.py
@@ -298,7 +298,7 @@ class TestNSXtScale(TestNSXtBase):
         self.reconfigure_cluster_interfaces(cluster_id)
 
         self.show_step(5)  # Enable plugin and configure network settings
-        self.enable_plugin(self.fuel_web, cluster_id)
+        self.enable_plugin(cluster_id)
 
         # Configure VMware settings. 1 cluster, 1 Nova Compute: compute-vmware
         self.show_step(6)
diff --git a/plugin_test/tests/test_plugin_system.py b/plugin_test/tests/test_plugin_system.py
index 780a34e..520c16b 100644
--- a/plugin_test/tests/test_plugin_system.py
+++ b/plugin_test/tests/test_plugin_system.py
@@ -163,8 +163,8 @@ class TestNSXtSystem(TestNSXtBase):
         default_net = os_conn.nova.networks.find(
             label=self.default.PRIVATE_NET)
 
-        vm1_fip = os_conn.assign_floating_ip(vm1)
-        vm2_fip = os_conn.assign_floating_ip(vm2)
+        vm1_fip = os_conn.assign_floating_ip(vm1).ip
+        vm2_fip = os_conn.assign_floating_ip(vm2).ip
 
         vm1_ip = os_conn.get_nova_instance_ip(vm1, net_name=default_net)
         vm2_ip = os_conn.get_nova_instance_ip(vm2, net_name=default_net)