diff --git a/get_metrics.sh b/get_metrics.sh
index 35f3cb6..6a75d0c 100755
--- a/get_metrics.sh
+++ b/get_metrics.sh
@@ -12,7 +12,7 @@
 not_tests='lib/kunit/test.c
 '
 
-all_tests=$(for file_name in $(grep -Hrnl -e '#include <kunit/test.h>' | grep -E 'test|_kunit\.c' | grep -v '^Documentation')
+all_tests=$(for file_name in $(git grep -l -e '#include <kunit/test.h>' | grep -E 'test|_kunit\.c' | grep -v '^Documentation')
 do
   if [[ ! $not_tests =~ (^|[[:space:]])"$file_name"($|[[:space:]]) ]] ; then
     printf "$file_name\n"
@@ -22,8 +22,7 @@
 tests_total_num=$(echo "$all_tests" | wc -l)
 test_authors=$(git --no-pager shortlog --no-merges -n -s -- $all_tests)
 test_author_num=$(echo "$test_authors" | wc -l)
-test_case_num=$(find ./ -type f ! -wholename '*/Documentation/*' ! -name 'test.h' ! -name 'get_metrics.sh' -print0 |
-  xargs -0 grep 'KUNIT_CASE' | wc -l)
+test_case_num=$(git grep 'KUNIT_CASE' | grep -Ev '^Documentation/|get_metrics.sh|include/kunit/test.h' | wc -l)
 
 
 if [[ -n $VERBOSE ]]; then