diff --git a/vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py b/vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py
index 2211284..cca3ea4 100644
--- a/vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py
+++ b/vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py
@@ -58,11 +58,13 @@ class ProviderNetworks(feature_manager.FeatureManager):
         vxlan_flag = 0
         for tz in out:
             if "transport_type" in tz.keys() and \
-                    (vlan_flag == 0 or vxlan_flag == 0):
-                if vxlan_flag == 0 and tz['transport_type'] == "OVERLAY":
+                   (vlan_flag == 0 or vxlan_flag == 0):
+                if vxlan_flag == 0 and tz['transport_type'] == "OVERLAY"\
+                        and tz['_create_user'] == 'admin':
                     cls.overlay_id = tz['id']
                     vxlan_flag = 1
-                if vlan_flag == 0 and tz['transport_type'] == "VLAN":
+                if vlan_flag == 0 and tz['transport_type'] == "VLAN"\
+                        and tz['_create_user'] == 'admin':
                     cls.vlan_id = tz['id']
                     vlan_flag = 1
 
diff --git a/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py
index 0a780e0..52ec729 100644
--- a/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py
+++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py
@@ -60,6 +60,7 @@ class TestPools(base.BaseTestCase):
                 protocol='HTTP', protocol_port=PROTOCOL_PORT,
                 wait=True)
             listener_id = listener.get('id')
+            self.addCleanup(self._delete_listener, listener_id)
         response = self._create_pool(protocol=protocol,
                                      lb_algorithm=lb_algorithm,
                                      listener_id=listener_id,
diff --git a/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py
index fc1247e..eb9165c 100644
--- a/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py
+++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py
@@ -162,8 +162,8 @@ class ProviderSecurityGroupTest(base.BaseAdminNetworkTest):
         if CONF.network.backend == 'nsxp':
             self.assertNotEmpty(self.nsxp.get_firewall_section(
                 sg_name, sg_id, 'default'))
-            self.assertNotEmpty(self.nsxp.get_firewall_section(sg_name, sg_id,
-                                                              nsxp=True))
+            self.assertNotEmpty(self.nsxp.get_firewall_section(
+                sg_name, sg_id, os_tenant_id='default'))
         else:
             self.assertNotEmpty(self.nsx.get_firewall_section(sg_name, sg_id))
 
diff --git a/vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py b/vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py
index 924cb53..da80ea4 100644
--- a/vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py
+++ b/vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py
@@ -57,11 +57,13 @@ class ProviderNetworks(feature_manager.FeatureManager):
         vxlan_flag = 0
         for tz in out:
             if "transport_type" in tz.keys() and \
-                    (vlan_flag == 0 or vxlan_flag == 0):
-                if vxlan_flag == 0 and tz['transport_type'] == "OVERLAY":
+                   (vlan_flag == 0 or vxlan_flag == 0):
+                if vxlan_flag == 0 and tz['transport_type'] == "OVERLAY"\
+                        and tz['_create_user'] == 'admin':
                     cls.overlay_id = tz['id']
                     vxlan_flag = 1
-                if vlan_flag == 0 and tz['transport_type'] == "VLAN":
+                if vlan_flag == 0 and tz['transport_type'] == "VLAN"\
+                        and tz['_create_user'] == 'admin':
                     cls.vlan_id = tz['id']
                     vlan_flag = 1