diff --git a/neutron/tests/functional/resources/ovsdb/events.py b/neutron/tests/functional/resources/ovsdb/events.py
index 960f46528c4..a0a81bf142f 100644
--- a/neutron/tests/functional/resources/ovsdb/events.py
+++ b/neutron/tests/functional/resources/ovsdb/events.py
@@ -30,7 +30,7 @@ class WaitForCrLrpPortBindingEvent(event.RowEvent):
         self.logical_port_events = collections.defaultdict(threading.Event)
         self.timeout = timeout
         super(WaitForCrLrpPortBindingEvent, self).__init__(
-            (self.ROW_CREATE,), 'Port_Binding', None)
+            (self.ROW_CREATE, self.ROW_UPDATE), 'Port_Binding', None)
 
     def match_fn(self, event, row, old=None):
         return row.logical_port.startswith(self.PREFIX)
diff --git a/neutron/tests/functional/services/ovn_l3/test_plugin.py b/neutron/tests/functional/services/ovn_l3/test_plugin.py
index 9085682c9d5..64f67d0ed06 100644
--- a/neutron/tests/functional/services/ovn_l3/test_plugin.py
+++ b/neutron/tests/functional/services/ovn_l3/test_plugin.py
@@ -541,9 +541,9 @@ class TestRouter(base.TestOVNFunctionalBase):
         ext1 = self._create_ext_network(
             'ext1', 'flat', 'physnet4', None, "30.0.0.1", "30.0.0.0/24")
         gw_info = {'network_id': ext1['network']['id']}
-        # Tries to create 20 routers with a gateway. Since we're using
+        # Tries to create 5 routers with a gateway. Since we're using
         # physnet4, the chassis candidates will be chassis4 initially.
-        num_routers = 20
+        num_routers = 5
         for i in range(num_routers):
             try:
                 router = self._create_router('router%d' % i, gw_info=gw_info)