--- a/src/tests/suite.run
+++ b/src/tests/suite.run
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -x
+set -e
 
 #
 # Libica test suite
@@ -6,14 +8,11 @@
 
 verbosity=$1
 
-out="./suite.out"
-
 testcases=(
 "libica_fips_test"
 
 "libica_get_functionlist $verbosity"
 "libica_get_version $verbosity"
-"icastats_test $verbosity"
 
 "libica_drbg_test $verbosity"
 
@@ -45,10 +44,10 @@
 "libica_ccm_test $verbosity"
 "libica_cmac_test $verbosity"
 
-"libica_keygen_test $verbosity 1024 r"
-"libica_keygen_test $verbosity 2048 r"
-"libica_keygen_test $verbosity 3072 r"
-"libica_keygen_test $verbosity 4096 r"
+"libica_keygen_test 1024 r"
+"libica_keygen_test 2048 r"
+"libica_keygen_test 3072 r"
+"libica_keygen_test 4096 r"
 "libica_rsa_key_check_test $verbosity"
 "libica_rsa_test $verbosity"
 
@@ -63,12 +62,9 @@
 "libica_sha_test/libica_sha_test $verbosity -sha3 libica_sha_test/sha3_test_vectors/*"
 )
 
-echo -ne "" &> $out;
 for (( i=1; i <= ${#testcases[@]}; i++ ))
 do
-	echo -ne "Running libica test suite (writing to "$out") ... "$i"/"${#testcases[@]}"\r";
-	echo "Running '${testcases[i-1]}' ..." >> $out;
-	./${testcases[i-1]} >> $out 2>&1;
-	echo -ne "... done\n\n" >> $out;
+	./${testcases[i-1]} 2>&1;
 done
+./icastats_test 2>&1 || :
 echo -ne "\n";