diff --git a/neutron/tests/fullstack/base.py b/neutron/tests/fullstack/base.py
index aeea30f2c63..2c649fa8fa7 100644
--- a/neutron/tests/fullstack/base.py
+++ b/neutron/tests/fullstack/base.py
@@ -99,5 +99,6 @@ class BaseFullStackTestCase(testlib_api.MySQLTestCaseMixin,
             # happen only after RPC is established
             common_utils.wait_until_true(
                 done,
+                timeout=count * (ping_timeout + 1),
                 exception=RuntimeError("Could not ping the other VM, L2 agent "
                                        "restart leads to network disruption"))