diff --git a/tools/integration-tests.sh b/tools/integration-tests.sh
index f2b984437..4c8712a3a 100755
--- a/tools/integration-tests.sh
+++ b/tools/integration-tests.sh
@@ -37,7 +37,7 @@ export PATH SRCDIR BUILDDIR LOGDIR
 VERBOSE=${VERBOSE:-0}
 FILTER=${FILTER:-'*'}
 NUM_SAMPLES=${NUM_SAMPLES:-100}
-TIMEOUT=${TIMEOUT:-5m}
+TIMEOUT=${TIMEOUT:-2m}
 
 # Parse command line arguments
 while getopts ":f:l:t:v" OPT; do
@@ -106,7 +106,7 @@ for TEST in ${TESTS}; do
 
 	case $RC in
 		0)
-			echo -e "\e[32m[PASS] \e[39m ${TESTNAME} (ran for ${SECONDS} secs)"
+			echo -e "\e[32m[PASS] \e[39m ${TESTNAME} (ran for ${SECONDS}s)"
 			PASSED=$((${PASSED} + 1))
 			;;
 		99)
@@ -114,12 +114,12 @@ for TEST in ${TESTS}; do
 			SKIPPED=$((${SKIPPED} + 1))
 			;;
 		124)
-			echo -e "\e[33m[TIME] \e[39m ${TESTNAME}"
+			echo -e "\e[33m[TIME] \e[39m ${TESTNAME} (ran for more then ${TIMEOUT})"
 			TIMEDOUT=$((${TIMEDOUT} + 1))
 			FAILED=$((${FAILED} + 1))
 			;;
 		*)
-			echo -e "\e[31m[FAIL] \e[39m ${TESTNAME} (exited with code $RC, ran for ${SECONDS} secs)"
+			echo -e "\e[31m[FAIL] \e[39m ${TESTNAME} (exited with code $RC, ran for ${SECONDS}s)"
 			FAILED=$((${FAILED} + 1))
 			;;
 	esac