diff --git a/tobiko/shell/ping/_ping.py b/tobiko/shell/ping/_ping.py
index 2aa8e79a0..0bd94466e 100644
--- a/tobiko/shell/ping/_ping.py
+++ b/tobiko/shell/ping/_ping.py
@@ -328,7 +328,7 @@ def execute_ping(parameters, ssh_client=None, check=True):
     try:
         result = sh.execute(command=command,
                             ssh_client=ssh_client,
-                            timeout=parameters.deadline + 2.,
+                            timeout=parameters.deadline + 3.,
                             expect_exit_status=None,
                             network_namespace=parameters.network_namespace)
     except sh.ShellError as ex:
diff --git a/tobiko/shell/sh/_process.py b/tobiko/shell/sh/_process.py
index bfd748144..d9a2c541a 100644
--- a/tobiko/shell/sh/_process.py
+++ b/tobiko/shell/sh/_process.py
@@ -197,6 +197,8 @@ class ShellProcessFixture(tobiko.SharedFixture):
                 LOG.exception("Error closing STDERR stream: %r", self.stderr)
 
     def close(self, timeout: tobiko.Seconds = None):
+        if timeout is None:
+            timeout = self.parameters.timeout
         self.close_stdin()
         try:
             # Drain all incoming data from STDOUT and STDERR
diff --git a/tobiko/tripleo/pacemaker.py b/tobiko/tripleo/pacemaker.py
index 62f7c216a..0885dc9fd 100644
--- a/tobiko/tripleo/pacemaker.py
+++ b/tobiko/tripleo/pacemaker.py
@@ -413,6 +413,7 @@ def run_pcs_resource_operation(resource: str,
             output = execute_pcs(command_args,
                                  ssh_client=ssh_client,
                                  add_stderr=add_stderr,
+                                 timeout=operation_wait + 10.,
                                  sudo=True)
         except sh.ShellCommandFailed as exc:
             if attempt.is_last: