diff --git a/tobiko/tests/faults/agents/test_neutron_agents.py b/tobiko/tests/faults/agents/test_neutron_agents.py
index cb1a81db4..8178d3def 100644
--- a/tobiko/tests/faults/agents/test_neutron_agents.py
+++ b/tobiko/tests/faults/agents/test_neutron_agents.py
@@ -214,6 +214,7 @@ class BaseAgentTest(testtools.TestCase):
         return process_destroyed
 
 
+@neutron.skip_if_missing_networking_agents(neutron.DHCP_AGENT)
 class DHCPAgentTest(BaseAgentTest):
 
     #: Resources stack with Nova server to send messages to
@@ -273,6 +274,7 @@ class DHCPAgentTest(BaseAgentTest):
         self.get_cmd_pids("dnsmasq", self.stack.network, dhcp_agents_hosts)
 
 
+@neutron.skip_if_missing_networking_agents(neutron.L3_AGENT)
 class L3AgentTest(BaseAgentTest):
 
     #: Resources stack with Nova server to send messages to
@@ -436,6 +438,7 @@ class L3AgentTest(BaseAgentTest):
                                            l3_agents_hosts))
 
 
+@neutron.skip_if_missing_networking_agents(neutron.OPENVSWITCH_AGENT)
 class OvsAgentTest(BaseAgentTest):
 
     #: Resources stack with Nova server to send messages to
@@ -473,6 +476,7 @@ class OvsAgentTest(BaseAgentTest):
         self.start_service_on_hosts(self.agent_service_name, [agent['host']])
 
 
+@neutron.skip_if_missing_networking_agents(neutron.METADATA_AGENT)
 class MetadataAgentTest(BaseAgentTest):
 
     #: Resources stack with Nova server to send messages to
diff --git a/tobiko/tests/faults/ha/test_cloud_recovery.py b/tobiko/tests/faults/ha/test_cloud_recovery.py
index 98513ba79..12032752a 100644
--- a/tobiko/tests/faults/ha/test_cloud_recovery.py
+++ b/tobiko/tests/faults/ha/test_cloud_recovery.py
@@ -92,13 +92,13 @@ class DisruptTripleoNodesTest(testtools.TestCase):
     #     overcloud_health_checks()
     #     cloud_disruptions.network_undisrupt_controllers_non_main_vip()
 
-    @neutron.skip_if_missing_networking_agents(binary='ovn-controller')
+    @neutron.skip_if_missing_networking_agents(neutron.OVN_CONTROLLER)
     def test_reset_ovndb_master_resource(self):
         overcloud_health_checks()
         cloud_disruptions.reset_ovndb_master_resource()
         overcloud_health_checks()
 
-    @neutron.skip_if_missing_networking_agents(binary='ovn-controller')
+    @neutron.skip_if_missing_networking_agents(neutron.OVN_CONTROLLER)
     def test_reset_ovndb_master_container(self):
         overcloud_health_checks()
         cloud_disruptions.reset_ovndb_master_container()
diff --git a/tobiko/tests/faults/neutron/test_ovs.py b/tobiko/tests/faults/neutron/test_ovs.py
index c702f4796..17837745b 100644
--- a/tobiko/tests/faults/neutron/test_ovs.py
+++ b/tobiko/tests/faults/neutron/test_ovs.py
@@ -27,8 +27,8 @@ from tobiko.shell import sh
 from tobiko.tripleo import undercloud
 
 
-@neutron.skip_if_missing_networking_agents(binary='neutron-openvswitch-agent')
-@neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent')
+@neutron.skip_if_missing_networking_agents(neutron.OPENVSWITCH_AGENT)
+@neutron.skip_if_missing_networking_agents(neutron.L3_AGENT)
 class OpenvswitchTest(testtools.TestCase):
 
     stack = tobiko.required_setup_fixture(stacks.CirrosServerStackFixture)
diff --git a/tobiko/tests/functional/openstack/stacks/test_neutron.py b/tobiko/tests/functional/openstack/stacks/test_neutron.py
index f5875c4e3..a4753cb42 100644
--- a/tobiko/tests/functional/openstack/stacks/test_neutron.py
+++ b/tobiko/tests/functional/openstack/stacks/test_neutron.py
@@ -94,8 +94,7 @@ class NetworkWithNetMtuWriteTest(NetworkTest):
 
 @keystone.skip_unless_has_keystone_credentials()
 @neutron.skip_if_missing_networking_extensions('l3-ha')
-@neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent',
-                                           count=2)
+@neutron.skip_if_missing_networking_agents(neutron.L3_AGENT, 2)
 class L3HaNetworkTest(NetworkTest):
 
     #: Stack of resources with a network with a gateway router