diff --git a/tobiko/tests/faults/agents/__init__.py b/tobiko/tests/faults/agents/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tobiko/tests/faults/neutron/test_agents.py b/tobiko/tests/faults/neutron/test_agents.py
index bfb53e51a..997305ea6 100644
--- a/tobiko/tests/faults/neutron/test_agents.py
+++ b/tobiko/tests/faults/neutron/test_agents.py
@@ -18,6 +18,7 @@ import re
 import typing  # noqa
 
 from oslo_log import log
+import pytest
 import testtools
 
 import tobiko
@@ -717,6 +718,7 @@ class MetadataAgentTest(BaseAgentTest):
                     "Metadata server reached from Nova server:\n"
                     f"{curl_output}")
 
+    @pytest.mark.flaky(reruns=5, reruns_delay=120)
     def test_metadata_service_restart(self):
         # Ensure service is up
         self.start_agent()
diff --git a/tobiko/tests/scenario/neutron/test_port.py b/tobiko/tests/scenario/neutron/test_port.py
index 321c52b87..0f4946856 100644
--- a/tobiko/tests/scenario/neutron/test_port.py
+++ b/tobiko/tests/scenario/neutron/test_port.py
@@ -18,6 +18,7 @@ import typing
 
 import netaddr
 from oslo_log import log
+import pytest
 import testtools
 
 import tobiko
@@ -156,6 +157,7 @@ class PortLogsTest(testtools.TestCase):
             new_lines = log_digger.find_new_lines()
             self.assert_has_event(new_lines, 'network-vif-unplugged')
 
+    @pytest.mark.flaky(reruns=5, reruns_delay=120)
     def test_nova_port_notification_on_activate(self):
         self.stack.ensure_server_status('SHUTOFF')
         log_digger = topology.get_log_file_digger(
diff --git a/tobiko/tests/scenario/neutron/test_router.py b/tobiko/tests/scenario/neutron/test_router.py
index 55d3c55a5..b7db27c22 100644
--- a/tobiko/tests/scenario/neutron/test_router.py
+++ b/tobiko/tests/scenario/neutron/test_router.py
@@ -14,6 +14,7 @@
 #    under the License.
 from __future__ import absolute_import
 
+import pytest
 import testtools
 
 import tobiko
@@ -132,6 +133,7 @@ class L3HARouterTest(RouterTest):
     #: Resources stack with Nova server to send messages to
     stack = tobiko.required_setup_fixture(stacks.L3haServerStackFixture)
 
+    @pytest.mark.flaky(reruns=5, reruns_delay=120)
     @neutron.skip_if_missing_networking_extensions('l3_agent_scheduler')
     def test_router_is_scheduled_on_l3_agents(self):
         master_agent, backup_agents = get_master_and_backup_agents(