diff --git a/tools/check-style.sh b/tools/check-style.sh
index c5ad5f74a..1661b5952 100755
--- a/tools/check-style.sh
+++ b/tools/check-style.sh
@@ -9,7 +9,9 @@
 errors=0
 IFS=$'\n'
 found=
-grep $'\t' include/ tests/ docs/*.rst -rl | while read f; do
+# The mt=41 sets a red background for matched tabs:
+exec 3< <(GREP_COLORS='mt=41' grep $'\t' include/ tests/ docs/*.rst -rn --color=always)
+while read -u 3 f; do
     if [ -z "$found" ]; then
         echo -e '\e[31m\e[01mError: found tabs instead of spaces in the following files:\e[0m'
         found=1
@@ -20,7 +22,8 @@ grep $'\t' include/ tests/ docs/*.rst -rl | while read f; do
 done
 
 found=
-grep '\<\(if\|for\|while\)(' include/ tests/* -r --color=always | while read line; do
+exec 3< <(grep '\<\(if\|for\|while\)(' include/ tests/*.{cpp,py,h} -rn --color=always)
+while read -u 3 line; do
     if [ -z "$found" ]; then
         echo -e '\e[31m\e[01mError: found the following coding style problems:\e[0m'
         found=1