diff --git a/zaza/openstack/charm_tests/openstack_upgrade/tests.py b/zaza/openstack/charm_tests/openstack_upgrade/tests.py
index c34acae..620bda0 100644
--- a/zaza/openstack/charm_tests/openstack_upgrade/tests.py
+++ b/zaza/openstack/charm_tests/openstack_upgrade/tests.py
@@ -49,7 +49,6 @@ class OpenStackUpgradeVMLaunchBase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         """Run setup for OpenStack Upgrades."""
-        print("Running OpenStackUpgradeMixin setUpClass")
         super().setUpClass()
         cls.lts = LTSGuestCreateTest()
         cls.lts.setUpClass()
@@ -76,7 +75,6 @@ class WaitForMySQL(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         """Set up class."""
-        print("Running OpenstackUpgradeTests setUpClass")
         super().setUpClass()
         cli_utils.setup_logging()
 
@@ -93,7 +91,6 @@ class OpenStackUpgradeTestsFocalUssuri(OpenStackUpgradeVMLaunchBase):
     @classmethod
     def setUpClass(cls):
         """Run setup for OpenStack Upgrades."""
-        print("Running OpenstackUpgradeTests setUpClass")
         super().setUpClass()
         cli_utils.setup_logging()
 
@@ -120,7 +117,6 @@ class OpenStackUpgradeTestsByOption(OpenStackUpgradeVMLaunchBase):
     @classmethod
     def setUpClass(cls):
         """Run setup for OpenStack Upgrades."""
-        print("Running OpenstackUpgradeTests setUpClass")
         super().setUpClass()
         cli_utils.setup_logging()
 
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index a4fcbc3..36ff964 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -1000,7 +1000,7 @@ def configure_networking_charms(networking_data, macs, use_juju_wait=True):
     # to deal with all the non ['active', 'idle', 'Unit is ready.']
     # workload/agent states and msgs that our mojo specs are exposed to.
     if use_juju_wait:
-        juju_wait.wait(wait_for_workload=True)
+        juju_wait.wait(wait_for_workload=True, max_wait=2700)
     else:
         zaza.model.wait_for_agent_status()
         # TODO: shouldn't access get_charm_config() here as it relies on