diff --git a/tobiko/openstack/neutron/__init__.py b/tobiko/openstack/neutron/__init__.py
index 6274e9faa..3b2e7b35d 100644
--- a/tobiko/openstack/neutron/__init__.py
+++ b/tobiko/openstack/neutron/__init__.py
@@ -45,6 +45,7 @@ skip_if_is_old_ovn = _agent.skip_if_is_old_ovn
 
 NeutronClientFixture = _client.NeutronClientFixture
 ServiceUnavailable = _client.ServiceUnavailable
+NeutronClientException = _client.NeutronClientException
 neutron_client = _client.neutron_client
 get_neutron_client = _client.get_neutron_client
 find_subnet = _client.find_subnet
diff --git a/tobiko/openstack/neutron/_client.py b/tobiko/openstack/neutron/_client.py
index 647564d45..dbffea38e 100644
--- a/tobiko/openstack/neutron/_client.py
+++ b/tobiko/openstack/neutron/_client.py
@@ -23,6 +23,7 @@ import tobiko
 from tobiko.openstack import _client
 
 
+NeutronClientException = neutronclient.exceptions.NeutronClientException
 ServiceUnavailable = neutronclient.exceptions.ServiceUnavailable
 
 
diff --git a/tobiko/openstack/tests/_neutron.py b/tobiko/openstack/tests/_neutron.py
index 8b2bec062..aa147fa3b 100644
--- a/tobiko/openstack/tests/_neutron.py
+++ b/tobiko/openstack/tests/_neutron.py
@@ -44,7 +44,8 @@ def test_neutron_agents_are_alive(timeout=300., interval=5.) \
         try:
             # get Neutron agent list
             agents = neutron.list_agents()
-        except neutron.ServiceUnavailable as ex:
+        except (neutron.ServiceUnavailable,
+                neutron.NeutronClientException) as ex:
             if attempt.is_last:
                 raise
             else: