diff --git a/runtime/colors/tools/check_colors.vim b/runtime/colors/tools/check_colors.vim
index 57b71b19d..5748ad508 100644
--- a/runtime/colors/tools/check_colors.vim
+++ b/runtime/colors/tools/check_colors.vim
@@ -83,33 +83,33 @@ func! Test_check_colors()
         \ ]
   let groups={}
   for group in hi_groups
-    if search('\c@suppress\s\+'.group, 'cnW')
+    if search('\c@suppress\s\+\<'.group.'\>', 'cnW')
       " skip check, if the script contains a line like
       " @suppress Visual:
-      let groups[group] = 'Ignoring '.group
+      " let groups[group] = 'Ignoring '.group
       continue
     endif
     if search('hi\%[ghlight]!\= \+link \+'.group, 'cnW') " Linked group
       continue
     endif
-    if !search('hi\%[ghlight] \+'.group, 'cnW')
+    if !search('hi\%[ghlight] \+\<'.group.'\>', 'cnW')
       let groups[group] = 'No highlight definition for '.group
       continue
     endif
-    if !search('hi\%[ghlight] \+'.group. '.*fg=', 'cnW')
+    if !search('hi\%[ghlight] \+\<'.group. '\>.*fg=', 'cnW')
       let groups[group] = 'Missing foreground color for '.group
       continue
     endif
-    if search('hi\%[ghlight] \+'.group. '.*guibg=', 'cnW') &&
-        \ !search('hi\%[ghlight] \+'.group. '.*ctermbg=', 'cnW')
+    if search('hi\%[ghlight] \+\<'.group. '\>.*guibg=', 'cnW') &&
+        \ !search('hi\%[ghlight] \+\<'.group. '\>.*ctermbg=', 'cnW')
       let groups[group] = 'Missing bg terminal color for '.group
       continue
     endif
-    if !search('hi\%[ghlight] \+'.group. '.*guifg=', 'cnW')
+    if !search('hi\%[ghlight] \+\<'.group. '\>.*guifg=', 'cnW')
       let groups[group] = 'Missing guifg definition for '.group
       continue
     endif
-    if !search('hi\%[ghlight] \+'.group. '.*ctermfg=', 'cnW')
+    if !search('hi\%[ghlight] \+\<'.group. '\>.*ctermfg=', 'cnW')
       let groups[group] = 'Missing ctermfg definition for '.group
       continue
     endif