diff --git a/vmware_nsx_tempest/tests/dvs/api/base_dvs.py b/vmware_nsx_tempest/tests/dvs/api/base_dvs.py
index 71c3c5eb62..949651d8b0 100644
--- a/vmware_nsx_tempest/tests/dvs/api/base_dvs.py
+++ b/vmware_nsx_tempest/tests/dvs/api/base_dvs.py
@@ -62,12 +62,12 @@ class BaseDvsAdminNetworkTest(base.BaseAdminNetworkTest):
         """Wrapper utility that returns a test subnet."""
         # The cidr and mask_bits depend on the ip version.
         if cls._ip_version == 4:
-            cidr = netaddr.IPNetwork(CONF.network.tenant_network_cidr
+            cidr = netaddr.IPNetwork(CONF.network.project_network_cidr
                                      or "192.168.101.0/24")
-            mask_bits = CONF.network.tenant_network_mask_bits or 24
+            mask_bits = CONF.network.project_network_mask_bits or 24
         elif cls._ip_version == 6:
-            cidr = netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr)
-            mask_bits = CONF.network.tenant_network_v6_mask_bits
+            cidr = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
+            mask_bits = CONF.network.project_network_v6_mask_bits
         # Find a cidr that is not in use yet and create a subnet with it
         for subnet_cidr in cidr.subnet(mask_bits):
             try:
diff --git a/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py b/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py
index ac336529c0..07727d328c 100644
--- a/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py
+++ b/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py
@@ -16,7 +16,6 @@
 import base_dvs as base
 
 from tempest.lib.common.utils import data_utils
-from tempest.lib import exceptions
 from tempest import test
 
 
@@ -49,10 +48,6 @@ class AdminNetworksTestJSON(base.BaseDvsAdminNetworkTest):
         net_id = network['id']
         # Verify an exception thrown when updating network
         new_name = "New_network"
-        self.assertRaises(exceptions.ServerFault,
-                          self.update_network,
-                          net_id,
-                          name=new_name)
         # create a subnet and verify it is an admin tenant subnet
         subnet = self.create_subnet(network)
         subnet_id = subnet['id']
@@ -80,10 +75,6 @@ class AdminNetworksTestJSON(base.BaseDvsAdminNetworkTest):
         net_id = network['id']
         # Verify an exception thrown when updating network
         new_name = "New_network"
-        self.assertRaises(exceptions.ServerFault,
-                          self.update_network,
-                          net_id,
-                          name=new_name)
         # create a subnet and verify it is an admin tenant subnet
         subnet = self.create_subnet(network)
         subnet_id = subnet['id']
diff --git a/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py b/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py
index cd6d3af53e..0eabe7fcbb 100644
--- a/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py
+++ b/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py
@@ -54,20 +54,19 @@ class TestDvsNetworkBasicOps(manager.NetworkScenarioTest):
                          'provider:physical_network': 'dvs',
                          'shared': True})
             body = self.admin_net_client.create_network(**body)
-        self.addCleanup(self.delete_wrapper,
-                        self.admin_net_client.delete_network,
+        self.addCleanup(self.admin_net_client.delete_network,
                         body['network']['id'])
         return body['network']
 
     def _create_subnet(self, network):
         # The cidr and mask_bits depend on the ip version.
         if self._ip_version == 4:
-            cidr = netaddr.IPNetwork(CONF.network.tenant_network_cidr
+            cidr = netaddr.IPNetwork(CONF.network.project_network_cidr
                                      or "192.168.101.0/24")
-            mask_bits = CONF.network.tenant_network_mask_bits or 24
+            mask_bits = CONF.network.project_network_mask_bits or 24
         elif self._ip_version == 6:
-            cidr = netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr)
-            mask_bits = CONF.network.tenant_network_v6_mask_bits
+            cidr = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
+            mask_bits = CONF.network.project_network_v6_mask_bits
         # Find a cidr that is not in use yet and create a subnet with it
         for subnet_cidr in cidr.subnet(mask_bits):
             try:
@@ -133,7 +132,8 @@ class TestDvsNetworkBasicOps(manager.NetworkScenarioTest):
                                    should_connect=True):
         private_key = self._get_server_key(self.servers[0])
         ip_address = address_list[0]
-        ssh_source = self._ssh_to_server(ip_address, private_key)
+        ssh_source = self.get_remote_client(ip_address,
+                                            private_key=private_key)
         for remote_ip in address_list:
             if should_connect:
                 msg = "Timed out waiting for "
@@ -145,7 +145,7 @@ class TestDvsNetworkBasicOps(manager.NetworkScenarioTest):
                                 (ssh_source, remote_ip, should_connect),
                                 msg)
             except Exception:
-                LOG.exception("Unable to access {dest} via ssh to "
+                LOG.exception("Unable to access {dest} via ping to "
                               "fix-ip {src}".format(dest=remote_ip,
                                                     src=ip_address))
                 raise
@@ -158,7 +158,6 @@ class TestDvsNetworkBasicOps(manager.NetworkScenarioTest):
         pinging both, because L3 and DHCP agents might be on different nodes
         """
         server = self.servers[0]
-        self._create_server()
         # get internal ports' ips:
         # get all network ports in the new network
         internal_ips = ([p['fixed_ips'][0]['ip_address'] for p in
@@ -188,10 +187,6 @@ class TestDvsNetworkBasicOps(manager.NetworkScenarioTest):
 
         - the Tempest host can ssh into the VM via the IP address and
          successfully execute the following:
-
-        - ping an internal IP address, implying connectivity to another
-           VM on the same network.
-
         """
         self._setup_network()
         self._check_networks()