diff --git a/tests/scripts/checkscripts.sh b/tests/scripts/checkscripts.sh
index 28ee5f3c63..e0e3602347 100755
--- a/tests/scripts/checkscripts.sh
+++ b/tests/scripts/checkscripts.sh
@@ -54,7 +54,7 @@ SCRIPTFILES="\
 "
 
 for script in $SCRIPTFILES; do
-    echo "Checking $script ..."
+    #echo "Checking $script ..."
     if sh -n "$script" ; then : ; else
         echo "********* FAILED CHECK FOR $script *************"
         FAIL=1
diff --git a/tests/scripts/checkutf8.sh b/tests/scripts/checkutf8.sh
index 99904e321d..3106da17aa 100755
--- a/tests/scripts/checkutf8.sh
+++ b/tests/scripts/checkutf8.sh
@@ -34,7 +34,7 @@ DIRS="\
 
 for i in `find $DIRS -maxdepth 1 -type f`
 do
-	echo "Checking $i ..."
+	#echo "Checking $i ..."
 	iconv -f UTF8 -t UTF8 $i -o /dev/null
         if [ $? -ne 0 ]
 	then
@@ -43,12 +43,12 @@ do
 	fi
 done
 
-echo "Checking all Java files ..."
-for i in `find . -name \*.java -type f`
+echo "Checking all Java and Scala files ..."
+for i in `find . \( -name \*.java -o -name \*.scala \) -type f`
 do
 	#echo "Checking $i ..."
 	iconv -f UTF8 -t UTF8 $i -o /dev/null
-        if [ $? -ne 0 ]
+	if [ $? -ne 0 ]
 	then
 		echo "********* FAILED CHECK FOR $i *************"
 		FAIL=1
diff --git a/tests/scripts/checkxml.sh b/tests/scripts/checkxml.sh
index a14a833425..417053a00b 100755
--- a/tests/scripts/checkxml.sh
+++ b/tests/scripts/checkxml.sh
@@ -108,7 +108,7 @@ HTMLFILES="\
 echo 'Checking XML files....................'
 for i in $XMLFILES
 do
-	echo "Checking $i ..."
+	#echo "Checking $i ..."
 	xmllint --noout $i
         if [ $? -ne 0 ]
 	then
@@ -120,7 +120,7 @@ done
 echo 'Checking HTML files....................'
 for i in $HTMLFILES
 do
-	echo "Checking $i ..."
+	#echo "Checking $i ..."
 	xmllint --html --noout $i
 	# FIXME html mode never exits with an error code
 	# ... but it does output errors