diff --git a/neutron/tests/tempest/api/clients.py b/neutron/tests/tempest/api/clients.py
index 8b51c6e..c6f41d0 100644
--- a/neutron/tests/tempest/api/clients.py
+++ b/neutron/tests/tempest/api/clients.py
@@ -15,8 +15,8 @@
 
 from tempest.lib.services.compute import keypairs_client
 from tempest.lib.services.compute import servers_client
+from tempest.lib.services.identity.v2 import tenants_client
 from tempest import manager
-from tempest.services.identity.v2.json import tenants_client
 
 from neutron.tests.tempest import config
 from neutron.tests.tempest.services.network.json import network_client
diff --git a/neutron/tests/tempest/api/test_network_ip_availability.py b/neutron/tests/tempest/api/test_network_ip_availability.py
index 74395ea..6a81128 100644
--- a/neutron/tests/tempest/api/test_network_ip_availability.py
+++ b/neutron/tests/tempest/api/test_network_ip_availability.py
@@ -86,7 +86,7 @@
             mask_bits = config.safe_get_config_value(
                 'network', 'project_network_v6_mask_bits')
 
-        subnet_cidr = cidr.subnet(mask_bits).next()
+        subnet_cidr = next(cidr.subnet(mask_bits))
         prefix_len = subnet_cidr.prefixlen
         subnet = self.create_subnet(network,
                                     cidr=subnet_cidr,