diff --git a/integration/110_shutdown_test.sh b/integration/110_shutdown_test.sh
index 631df89cf..05330fbc6 100755
--- a/integration/110_shutdown_test.sh
+++ b/integration/110_shutdown_test.sh
@@ -2,15 +2,18 @@
 
 . ./config.sh
 
-start_suite "Check scope exits cleanly within 10 seconds"
+start_suite "Check scope exits cleanly within 5 seconds"
 
 scope_on $HOST1 launch
+sleep 5
 scope_on $HOST1 stop
 
-sleep 10
+sleep 5
 
-assert_raises "docker_on $HOST1 logs weavescope 2>&1 | grep 'app exiting'"
-assert_raises "docker_on $HOST1 logs weavescope 2>&1 | grep 'probe exiting'"
+# Save stdout for debugging output
+exec 3>&1 
+assert_raises "docker_on $HOST1 logs weavescope 2>&1 | grep 'app exiting' || (docker_on $HOST1 logs weavescope 2>&3 ; false)"
+assert_raises "docker_on $HOST1 logs weavescope 2>&1 | grep 'probe exiting' || (docker_on $HOST1 logs weavescope 2>&3 ; false)"
 assert_raises "docker_on $HOST1 inspect --format='{{.State.Running}}' weavescope" "false"
 
 scope_end_suite