diff --git a/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index a8acb823a96..021b713a027 100755
--- a/source/script/tests/selftest.sh
+++ b/source/script/tests/selftest.sh
@@ -139,4 +139,4 @@ if [ "$count" != 0 ]; then
     done
 fi
 
-teststatus $ARG0 $totalfailed
+teststatus $ARG0 $failed
diff --git a/source/script/tests/test_functions.sh b/source/script/tests/test_functions.sh
index 3d397ac2551..29b03faf425 100755
--- a/source/script/tests/test_functions.sh
+++ b/source/script/tests/test_functions.sh
@@ -100,7 +100,12 @@ testit() {
 		date
 		echo "Testing $name"
 	else
-		echo "Testing $name (`expr $failed + $totalfailed` test failed so far)"
+	        nf="`expr $failed + $totalfailed`";
+		if [ "$nf" = "0" ]; then 
+		    echo "Testing $name"
+		else 
+		    echo "Testing $name ($nf tests failed so far)"
+		fi
 	fi
 
 	smbd_check_only && SMBD_IS_UP="yes"