diff --git a/tools/docker/scripts/ci_entrypoint.sh b/tools/docker/scripts/ci_entrypoint.sh
index 12d2be915d..413dae1769 100755
--- a/tools/docker/scripts/ci_entrypoint.sh
+++ b/tools/docker/scripts/ci_entrypoint.sh
@@ -105,7 +105,10 @@ fi
 if $TOOLCHAIN_OK ; then
     echo -e "\n========== Running Test ==========" | tee -a $REPORT
     cd /workspace
-    "$@" |& tee -a $REPORT
+    if ! "$@" |& tee -a $REPORT ; then
+       echo -e "\nSummary: Test had non-zero exit status." | tee -a $REPORT
+       echo -e "Status: FAILED\n" | tee -a $REPORT
+    fi
 fi
 
 # Wrap up.
diff --git a/tools/docker/scripts/test_coverage.sh b/tools/docker/scripts/test_coverage.sh
index 8b144bf686..bf8fb88b7a 100755
--- a/tools/docker/scripts/test_coverage.sh
+++ b/tools/docker/scripts/test_coverage.sh
@@ -23,9 +23,8 @@ make ARCH="${ARCH}" VERSION="${VERSION}" TESTOPTS="${TESTOPTS}" test
 # gcov gets stuck on some files...
 # Maybe related: https://bugs.launchpad.net/gcc-arm-embedded/+bug/1694644
 # As a workaround we'll simply remove the offending files for now.
-rm -v "/workspace/cp2k/obj/${ARCH}/${VERSION}"/almo_scf_types.gcda
-rm -v "/workspace/cp2k/obj/${ARCH}/${VERSION}"/dbcsr_tensor_types.gcda
-rm -v "/workspace/cp2k/obj/${ARCH}/${VERSION}"/mp2_types.gcda
+rm -fv "/workspace/cp2k/obj/${ARCH}/${VERSION}"/almo_scf_types.gcda
+rm -fv "/workspace/cp2k/obj/${ARCH}/${VERSION}"/mp2_types.gcda
 #cd /tmp
 #for i in /workspace/cp2k/obj/${ARCH}/${VERSION}/*.gcda; do
 #    timeout 30 gcov $i >/dev/null 2>&1 || rm -v $i