diff --git a/test/shell/augeas-1.sh b/test/shell/augeas-1.sh
index 73b4282b..87b78304 100755
--- a/test/shell/augeas-1.sh
+++ b/test/shell/augeas-1.sh
@@ -10,9 +10,9 @@ mkdir -p "${MGMT_TMPDIR}"
 > "${MGMT_TMPDIR}"sshd_config
 
 # run empty graph, with prometheus support
-$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=augeas-1.yaml &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --yaml=augeas-1.yaml &
 pid=$!
-sleep 5s	# let it converge
+sleep 10s	# let it converge
 
 grep "X11Forwarding no" "${MGMT_TMPDIR}"sshd_config
 
@@ -20,7 +20,7 @@ sed -i "s/no/yes/" "${MGMT_TMPDIR}"sshd_config
 
 grep "X11Forwarding yes" "${MGMT_TMPDIR}"sshd_config
 
-sleep 3	# Augeas is slow
+sleep 10s	# Augeas is slow
 
 grep "X11Forwarding no" "${MGMT_TMPDIR}"sshd_config
 
diff --git a/test/shell/exec-fail.sh b/test/shell/exec-fail.sh
index 39af2530..96bd9ac0 100755
--- a/test/shell/exec-fail.sh
+++ b/test/shell/exec-fail.sh
@@ -3,7 +3,7 @@
 # should take a few seconds plus converged timeout, and test we don't hang!
 # TODO: should we return a different exit code if the resources fail?
 # TODO: should we be converged if one of the resources has permanently failed?
-$timeout --kill-after=40s 35s ./mgmt run --yaml exec-fail.yaml --converged-timeout=5 --no-watch --no-pgp --tmp-prefix &
+$timeout --kill-after=60s 55s ./mgmt run --yaml exec-fail.yaml --converged-timeout=5 --no-watch --no-pgp --tmp-prefix &
 pid=$!
 wait $pid	# get exit status
 exit $?
diff --git a/test/shell/file-mode.sh b/test/shell/file-mode.sh
index 0f95a894..aef2ca63 100755
--- a/test/shell/file-mode.sh
+++ b/test/shell/file-mode.sh
@@ -9,7 +9,7 @@ fi
 set -x
 
 # run till completion
-$timeout --kill-after=40s 35s ./mgmt run --yaml file-mode.yaml --converged-timeout=5 --no-watch --tmp-prefix &
+$timeout --kill-after=60s 55s ./mgmt run --yaml file-mode.yaml --converged-timeout=5 --no-watch --tmp-prefix &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/file-move-upper-dir.sh b/test/shell/file-move-upper-dir.sh
index c9c586fe..c77eb985 100755
--- a/test/shell/file-move-upper-dir.sh
+++ b/test/shell/file-move-upper-dir.sh
@@ -7,9 +7,9 @@ exit 0
 mkdir -p /tmp/mgmt/a/b/c/
 
 # run empty graph, with prometheus support
-$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=examples/deep-dirs.yaml &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --yaml=examples/deep-dirs.yaml &
 pid=$!
-sleep 5s	# let it converge
+sleep 10s	# let it converge
 
 grep f1 /tmp/mgmt/a/b/c/f1
 
diff --git a/test/shell/file-move.sh b/test/shell/file-move.sh
index c37e2586..dab57472 100755
--- a/test/shell/file-move.sh
+++ b/test/shell/file-move.sh
@@ -10,7 +10,7 @@ mkdir -p /tmp/mgmt/
 rm /tmp/mgmt/f1 || true
 
 # run empty graph, with prometheus support
-$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --yaml=file-move.yaml 2>&1 | tee /tmp/mgmt/file-move.log &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/load0.sh b/test/shell/load0.sh
index df07fa58..53ebee00 100755
--- a/test/shell/load0.sh
+++ b/test/shell/load0.sh
@@ -34,7 +34,7 @@ file "${tmpdir}/loadavg" {
 }
 EOF
 
-$timeout --kill-after=30s 15s ./mgmt run --tmp-prefix --converged-timeout=1 --lang "$tmpdir/load0.mcl"  &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --converged-timeout=1 --lang "$tmpdir/load0.mcl"  &
 pid=$!
 wait $pid	# get exit status
 e=$?
diff --git a/test/shell/prometheus-1.sh b/test/shell/prometheus-1.sh
index 8a54fa1f..a47db819 100755
--- a/test/shell/prometheus-1.sh
+++ b/test/shell/prometheus-1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # run empty graph, with prometheus support
-$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --prometheus &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --prometheus &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/prometheus-2.sh b/test/shell/prometheus-2.sh
index 99cce9ec..3f520675 100755
--- a/test/shell/prometheus-2.sh
+++ b/test/shell/prometheus-2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # run empty graph, with prometheus support
-$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --prometheus --prometheus-listen :52637 &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --prometheus --prometheus-listen :52637 &
 pid=$!
 sleep 5s	# let it converge
 
diff --git a/test/shell/prometheus-3.sh b/test/shell/prometheus-3.sh
index 99ec8890..31f30ab6 100755
--- a/test/shell/prometheus-3.sh
+++ b/test/shell/prometheus-3.sh
@@ -7,7 +7,7 @@ if [[ $(uname) == "Darwin" ]] ; then
 fi
 
 # run a graph, with prometheus support
-$timeout --kill-after=40s 35s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-3.yaml &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-3.yaml &
 pid=$!
 sleep 10s	# let it converge
 
diff --git a/test/shell/prometheus-4.sh b/test/shell/prometheus-4.sh
index a3b951a0..4b970e1d 100755
--- a/test/shell/prometheus-4.sh
+++ b/test/shell/prometheus-4.sh
@@ -7,9 +7,9 @@ if [[ $(uname) == "Darwin" ]] ; then
 fi
 
 # run a graph, with prometheus support
-$timeout --kill-after=30s 25s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-4.yaml &
+$timeout --kill-after=60s 55s ./mgmt run --tmp-prefix --no-pgp --prometheus --yaml prometheus-4.yaml &
 pid=$!
-sleep 10s	# let it converge
+sleep 15s	# let it converge
 
 # For test debugging purpose
 curl 127.0.0.1:9233/metrics
diff --git a/test/shell/t6.sh b/test/shell/t6.sh
index f15b5be8..27b31ec7 100755
--- a/test/shell/t6.sh
+++ b/test/shell/t6.sh
@@ -7,24 +7,24 @@ if env | grep -q -e '^TRAVIS=true$'; then
 fi
 
 # run till completion
-$timeout --kill-after=40s 35s ./mgmt run --yaml t6.yaml --no-watch --tmp-prefix &
+$timeout --kill-after=60s 55s ./mgmt run --yaml t6.yaml --no-watch --tmp-prefix &
 pid=$!
-sleep 1s	# let it converge
+sleep 10s	# let it converge
 test -e /tmp/mgmt/f1
 test -e /tmp/mgmt/f2
 test -e /tmp/mgmt/f3
 test ! -e /tmp/mgmt/f4
 rm -f /tmp/mgmt/f2
-sleep 0.1s	# let it converge or tests will fail
+sleep 1s	# let it converge or tests will fail
 test -e /tmp/mgmt/f2
 rm -f /tmp/mgmt/f2
-sleep 0.1s
+sleep 1s
 test -e /tmp/mgmt/f2
 echo foo > /tmp/mgmt/f2
-sleep 0.1s
+sleep 1s
 test "`cat /tmp/mgmt/f2`" = "i am f2"
 rm -f /tmp/mgmt/f2
-sleep 0.1s
+sleep 1s
 test -e /tmp/mgmt/f2
 
 killall -SIGINT mgmt	# send ^C to exit mgmt