diff --git a/neutron/tests/fullstack/test_agent_bandwidth_report.py b/neutron/tests/fullstack/test_agent_bandwidth_report.py
index 631334214d8..0b6d9bc4751 100644
--- a/neutron/tests/fullstack/test_agent_bandwidth_report.py
+++ b/neutron/tests/fullstack/test_agent_bandwidth_report.py
@@ -215,16 +215,21 @@ class TestPlacementBandwidthReport(base.BaseFullStackTestCase):
         return not self._check_agent_synced()
 
     def _check_agent_synced(self):
-        agents = self.client.list_agents()
-        if (len(agents['agents']) == 1 and
-                agents['agents'][0]['resources_synced']):
-            return True
+        agents = self.client.list_agents(agent_type=self.l2_agent_type)
+        for agent in agents['agents']:
+            if (agent['id'] == self.original_agent_id and
+                    agent['resources_synced']):
+                return True
         return False
 
     def test_configurations_are_synced_towards_placement(self):
         neutron_config = self.environment.hosts[0].l2_agent.neutron_config
         report_interval = int(neutron_config['agent']['report_interval'])
 
+        agents = self.client.list_agents(agent_type=self.l2_agent_type)
+        self.assertEqual(1, len(agents['agents']))
+        self.original_agent_id = agents['agents'][0]['id']
+
         check_agent_synced = functools.partial(self._check_agent_synced)
         utils.wait_until_true(
             predicate=check_agent_synced,