diff --git a/.github/tour.sh b/.github/tour.sh
index 8964dc1f..874ce3e3 100755
--- a/.github/tour.sh
+++ b/.github/tour.sh
@@ -38,7 +38,7 @@ echo Build clitester
 cmake --build tester_build --config Release
 
 echo Start test server
-( timeout 600 python3 ./ipfs_chromium/test_data/test_server.py 8080 2>&1 | tee server.log & ) &
+( timeout 999 python3 ./ipfs_chromium/test_data/test_server.py 8080 2>&1 | tee server.log & ) &
 for t in 1{0..9}
 do
   if grep -n . server.log
@@ -59,11 +59,15 @@ function url_case() {
   echo "test case description =${4}"
   ll="${5-note}"
   echo "log level = ${ll}"
-  if timeout 430 ./tester_build/clitester "${ll}" "${1}://${2}"
+  set +x
+  timeout 440 ./tester_build/clitester "${ll}" "${1}://${2}"
+  ec=$?
+  set -x
+  if [ ${ec} -eq 0 ]
   then
     echo clitester exited with successful status
   else
-    echo "Directly reported error code from clitester run - usually means timeout killed it. " "${@}"
+	echo "Directly reported error code ${ec} from clitester run - usually means timeout killed it. " "${@}"
 	exit 6
   fi
   n=`sed 's,[^A-Za-z0-9\.],_,g' <<< ${2}`
@@ -96,9 +100,13 @@ function url_case() {
 }
 
 unstable_case() {
-	if ! timeout 400 ./tester_build/clitester "ipns://${1}"
+	set +x
+	timeout 401 ./tester_build/clitester "ipns://${1}"
+	ec=$?
+	set -x
+	if [ ${ec} -ne 0 ]
 	then
-		echo "clitester (or timeout) exited with failure code for ipns://${1}"
+		echo "clitester (or timeout) failed with exit code ${ec} for ipns://${1}"
 		exit 5
 	fi
 	n=`sed 's,[^A-Za-z0-9\.],_,g' <<< ${1}`