diff --git a/zaza/openstack/charm_tests/neutron/tests.py b/zaza/openstack/charm_tests/neutron/tests.py
index ec6998d..311e763 100644
--- a/zaza/openstack/charm_tests/neutron/tests.py
+++ b/zaza/openstack/charm_tests/neutron/tests.py
@@ -295,19 +295,31 @@ class NeutronCreateNetworkTest(test_utils.OpenStackBaseTest):
 
     def test_400_create_network(self):
         """Create a network, verify that it exists, and then delete it."""
+        self._wait_for_neutron_ready()
         self._assert_test_network_doesnt_exist()
         self._create_test_network()
         net_id = self._assert_test_network_exists_and_return_id()
         self._delete_test_network(net_id)
         self._assert_test_network_doesnt_exist()
 
+    @classmethod
+    def _wait_for_neutron_ready(cls):
+        logging.info('Waiting for Neutron to become ready...')
+        zaza.model.wait_for_application_states()
+        for attempt in tenacity.Retrying(
+                wait=tenacity.wait_fixed(5),  # seconds
+                stop=tenacity.stop_after_attempt(12),
+                reraise=True):
+            with attempt:
+                cls.neutron_client.list_networks()
+
     def _create_test_network(self):
-        logging.debug('Creating neutron network...')
+        logging.info('Creating neutron network...')
         network = {'name': self._TEST_NET_NAME}
         self.neutron_client.create_network({'network': network})
 
     def _delete_test_network(self, net_id):
-        logging.debug('Deleting neutron network...')
+        logging.info('Deleting neutron network...')
         self.neutron_client.delete_network(net_id)
 
     def _assert_test_network_exists_and_return_id(self):
diff --git a/zaza/openstack/charm_tests/neutron_arista/tests.py b/zaza/openstack/charm_tests/neutron_arista/tests.py
index ba29bd6..354dfd1 100644
--- a/zaza/openstack/charm_tests/neutron_arista/tests.py
+++ b/zaza/openstack/charm_tests/neutron_arista/tests.py
@@ -29,14 +29,7 @@ class NeutronCreateAristaNetworkTest(neutron_tests.NeutronCreateNetworkTest):
     def setUpClass(cls):
         """Run class setup for running Neutron Arista tests."""
         super(NeutronCreateAristaNetworkTest, cls).setUpClass()
-
-        logging.info('Waiting for Neutron to become ready...')
-        for attempt in tenacity.Retrying(
-                wait=tenacity.wait_fixed(5),  # seconds
-                stop=tenacity.stop_after_attempt(12),
-                reraise=True):
-            with attempt:
-                cls.neutron_client.list_networks()
+        cls._wait_for_neutron_ready()
 
     def _assert_test_network_exists_and_return_id(self):
         logging.info('Checking that the test network exists on the Arista '