diff --git a/magnum/tests/contrib/copy_instance_logs.sh b/magnum/tests/contrib/copy_instance_logs.sh
index 1c55bf4..f9fcd20 100755
--- a/magnum/tests/contrib/copy_instance_logs.sh
+++ b/magnum/tests/contrib/copy_instance_logs.sh
@@ -48,6 +48,7 @@ if [[ "$COE" == "kubernetes" ]]; then
     remote_exec $SSH_USER "sudo journalctl -u cloud-final --no-pager" cloud-final.log
     remote_exec $SSH_USER "sudo journalctl -u cloud-init-local --no-pager" cloud-init-local.log
     remote_exec $SSH_USER "sudo journalctl -u cloud-init --no-pager" cloud-init.log
+    remote_exec $SSH_USER "sudo cat /var/log/cloud-init-output.log" cloud-init-output.log
     remote_exec $SSH_USER "sudo journalctl -u kubelet --no-pager" kubelet.log
     remote_exec $SSH_USER "sudo journalctl -u kube-proxy --no-pager" kube-proxy.log
     remote_exec $SSH_USER "sudo journalctl -u etcd --no-pager" etcd.log
diff --git a/magnum/tests/functional/api/v1/clients/bay_client.py b/magnum/tests/functional/api/v1/clients/bay_client.py
index 7cd4159..854ad05 100644
--- a/magnum/tests/functional/api/v1/clients/bay_client.py
+++ b/magnum/tests/functional/api/v1/clients/bay_client.py
@@ -112,12 +112,12 @@ class BayClient(client.MagnumClient):
 
     def wait_for_bay_to_delete(self, bay_id):
         utils.wait_for_condition(
-            lambda: self.does_bay_not_exist(bay_id), 10, 3600)
+            lambda: self.does_bay_not_exist(bay_id), 10, 600)
 
     def wait_for_created_bay(self, bay_id, delete_on_error=True):
         try:
             utils.wait_for_condition(
-                lambda: self.does_bay_exist(bay_id), 10, 3600)
+                lambda: self.does_bay_exist(bay_id), 10, 1800)
         except Exception:
             # In error state.  Clean up the bay id if desired
             self.LOG.error('Bay %s entered an exception state.' % bay_id)
@@ -129,7 +129,7 @@ class BayClient(client.MagnumClient):
 
     def wait_for_final_state(self, bay_id):
         utils.wait_for_condition(
-            lambda: self.is_bay_in_final_state(bay_id), 10, 3600)
+            lambda: self.is_bay_in_final_state(bay_id), 10, 1800)
 
     def is_bay_in_final_state(self, bay_id):
         try:
diff --git a/magnum/tests/functional/api/v1/test_bay.py b/magnum/tests/functional/api/v1/test_bay.py
index a08a11a..c73555a 100644
--- a/magnum/tests/functional/api/v1/test_bay.py
+++ b/magnum/tests/functional/api/v1/test_bay.py
@@ -61,7 +61,7 @@ class BayTest(base.BaseMagnumTest):
 
             # NOTE (dimtruck) by default tempest sets timeout to 20 mins.
             # We need more time.
-            test_timeout = 3600
+            test_timeout = 1800
             self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
         except Exception:
             self.tearDown()