diff --git a/neutron_tempest_plugin/api/clients.py b/neutron_tempest_plugin/api/clients.py
index 407e694..df0eb4d 100644
--- a/neutron_tempest_plugin/api/clients.py
+++ b/neutron_tempest_plugin/api/clients.py
@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest.lib.services.compute import availability_zone_client
-from tempest.lib.services.compute import hypervisor_client
+from tempest.lib.services.compute import hosts_client
 from tempest.lib.services.compute import interfaces_client
 from tempest.lib.services.compute import keypairs_client
 from tempest.lib.services.compute import servers_client
@@ -78,9 +77,7 @@
             self.auth_provider, **params)
         self.keypairs_client = keypairs_client.KeyPairsClient(
             self.auth_provider, **params)
-        self.hv_client = hypervisor_client.HypervisorClient(
-            self.auth_provider, **params)
-        self.az_client = availability_zone_client.AvailabilityZoneClient(
+        self.hosts_client = hosts_client.HostsClient(
             self.auth_provider, **params)
 
     def _set_identity_clients(self):