diff --git a/zun_tempest_plugin/tests/tempest/api/clients.py b/zun_tempest_plugin/tests/tempest/api/clients.py
index b0cd2eb..0941b8b 100644
--- a/zun_tempest_plugin/tests/tempest/api/clients.py
+++ b/zun_tempest_plugin/tests/tempest/api/clients.py
@@ -344,7 +344,7 @@ class ZunClient(rest_client.RestClient):
                 return True
             else:
                 return False
-        utils.wait_for_condition(is_container_in_desired_state, timeout=120)
+        utils.wait_for_condition(is_container_in_desired_state, timeout=240)
 
     def ensure_container_deleted(self, container_id):
         def is_container_deleted():
@@ -354,7 +354,7 @@ class ZunClient(rest_client.RestClient):
                 return False
             else:
                 return True
-        utils.wait_for_condition(is_container_deleted)
+        utils.wait_for_condition(is_container_deleted, timeout=240)
 
     def ensure_action_finished(self, container_id, request_id):
         def is_action_finished():
@@ -403,7 +403,7 @@ class ZunClient(rest_client.RestClient):
                 return True
             else:
                 return False
-        utils.wait_for_condition(is_capsule_in_desired_state, timeout=120)
+        utils.wait_for_condition(is_capsule_in_desired_state, timeout=240)
 
     def list_capsules(self, **kwargs):
         resp, body = self.get(self.capsules_uri(), **kwargs)
@@ -424,7 +424,7 @@ class ZunClient(rest_client.RestClient):
                 return False
             else:
                 return True
-        utils.wait_for_condition(is_capsule_deleted)
+        utils.wait_for_condition(is_capsule_deleted, timeout=240)
 
     def delete_network(self, network_id, params=None):
         return self.delete(self.network_uri(network_id, params=params))
diff --git a/zun_tempest_plugin/tests/tempest/api/test_containers.py b/zun_tempest_plugin/tests/tempest/api/test_containers.py
index 0f095a4..cbed751 100644
--- a/zun_tempest_plugin/tests/tempest/api/test_containers.py
+++ b/zun_tempest_plugin/tests/tempest/api/test_containers.py
@@ -376,6 +376,7 @@ class TestContainer(base.BaseZunTest):
         self.assertIn('10.1.0', addr)
 
     @decorators.idempotent_id('7a947d75-ab23-439a-bd94-f6e219f716a9')
+    @testtools.skip('bug 1897497')
     def test_run_container_with_cinder_volumes(self):
         """Tests the following: