diff --git a/tests/testflows/helpers/cluster.py b/tests/testflows/helpers/cluster.py
index 9f86d44124c..6d3ae97e000 100644
--- a/tests/testflows/helpers/cluster.py
+++ b/tests/testflows/helpers/cluster.py
@@ -167,17 +167,20 @@ class Cluster(object):
         self.docker_compose += f" --project-directory \"{docker_compose_project_dir}\" --file \"{docker_compose_file_path}\""
         self.lock = threading.Lock()
 
-    def shell(self, node):
+    def shell(self, node, timeout=120):
         """Returns unique shell terminal to be used.
         """
         if node is None:
             return Shell()
 
-        return Shell(command=[
+        shell = Shell(command=[
                 "/bin/bash", "--noediting", "-c", f"{self.docker_compose} exec {node} bash --noediting"
             ], name=node)
 
-    def bash(self, node, timeout=60):
+        shell.timeout = timeout
+        return shell
+
+    def bash(self, node, timeout=120):
         """Returns thread-local bash terminal
         to a specific node.