diff --git a/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh b/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh
index 7742fac44781..98f650c9bf54 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh
@@ -22,9 +22,10 @@ editor=${EDITOR-vi}
 files=
 for i in ${rundir}/*/Make.out
 do
-	if grep -q "error:" < $i
+	if egrep -q "error:|warning:" < $i
 	then
-		files="$files $i"
+		egrep "error:|warning:" < $i > $i.diags
+		files="$files $i.diags $i"
 	fi
 done
 if test -n "$files"