diff --git a/ironic_tempest_plugin/manager.py b/ironic_tempest_plugin/manager.py
index b529e3c..c3d839d 100644
--- a/ironic_tempest_plugin/manager.py
+++ b/ironic_tempest_plugin/manager.py
@@ -504,8 +504,13 @@
         return network
 
     def _get_server_port_id_and_ip4(self, server, ip_addr=None):
-        ports = self.os_admin.ports_client.list_ports(
-            device_id=server['id'], fixed_ip=ip_addr)['ports']
+        if ip_addr:
+            ports = self.os_admin.ports_client.list_ports(
+                device_id=server['id'],
+                fixed_ips='ip_address=%s' % ip_addr)['ports']
+        else:
+            ports = self.os_admin.ports_client.list_ports(
+                device_id=server['id'])['ports']
         # A port can have more than one IP address in some cases.
         # If the network is dual-stack (IPv4 + IPv6), this port is associated
         # with 2 subnets
diff --git a/ironic_tempest_plugin/tests/scenario/introspection_manager.py b/ironic_tempest_plugin/tests/scenario/introspection_manager.py
index eb31327..21b9911 100644
--- a/ironic_tempest_plugin/tests/scenario/introspection_manager.py
+++ b/ironic_tempest_plugin/tests/scenario/introspection_manager.py
@@ -201,8 +201,7 @@
         while True:
             time.sleep(CONF.baremetal_introspection.hypervisor_update_sleep)
             stats = self.hypervisor_stats()
-            expected_cpus = self.baremetal_flavor()['vcpus']
-            if int(stats['hypervisor_statistics']['vcpus']) >= expected_cpus:
+            if int(stats['hypervisor_statistics']['count']):
                 break
 
             timeout = CONF.baremetal_introspection.hypervisor_update_timeout