diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 32bd1aafebc..3a966daea41 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -50,11 +50,6 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/n
 # Broken symlinks
 find -L $ROOT_PATH -type l 2>/dev/null | grep -v contrib && echo "^ Broken symlinks found"
 
-# Double whitespaces
-find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
-    grep -vP $EXCLUDE_DIRS |
-    while read i; do $ROOT_PATH/utils/check-style/double-whitespaces.pl < $i || echo -e "^ File $i contains double whitespaces\n"; done
-
 # Unused/Undefined/Duplicates ErrorCodes/ProfileEvents/CurrentMetrics
 declare -A EXTERN_TYPES
 EXTERN_TYPES[ErrorCodes]=int
diff --git a/utils/check-style/check-whitespaces b/utils/check-style/check-whitespaces
index 5a20569868d..507b1dd2ede 100755
--- a/utils/check-style/check-whitespaces
+++ b/utils/check-style/check-whitespaces
@@ -2,8 +2,9 @@
 
 ROOT_PATH=$(git rev-parse --show-toplevel)
 EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|consistent-hashing/|Parsers/New'
+NPROC=$(($(nproc) + 3))
 
 # Double whitespaces
 find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
     grep -vP $EXCLUDE_DIRS |
-    while read i; do $ROOT_PATH/utils/check-style/double-whitespaces.pl < $i || echo -e "^ File $i contains double whitespaces\n"; done
+    xargs -P "$NPROC" -n 20 "${ROOT_PATH}/utils/check-style/double-whitespaces.pl"
diff --git a/utils/check-style/double-whitespaces.pl b/utils/check-style/double-whitespaces.pl
index 47b03cb74ab..daeddecbd27 100755
--- a/utils/check-style/double-whitespaces.pl
+++ b/utils/check-style/double-whitespaces.pl
@@ -5,27 +5,31 @@ use strict;
 # Find double whitespace such as "a,  b, c" that looks very ugly and annoying.
 # But skip double whitespaces if they are used as an alignment - by comparing to surrounding lines.
 
-my @array;
-
-while (<>)
-{
-    push @array, $_;
-}
-
 my $ret = 0;
 
-for (my $i = 1; $i < $#array; ++$i)
+foreach my $file (@ARGV)
 {
-    if ($array[$i] =~ ',( {2,3})[^ /]')
-    {
-        # https://stackoverflow.com/questions/87380/how-can-i-find-the-location-of-a-regex-match-in-perl
+    my @array;
 
-        if ((substr($array[$i - 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/) # whitespaces are not part of alignment
-         && (substr($array[$i + 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/)
-         && $array[$i] !~ /(-?\d+\w*,\s+){3,}/) # this is not a number table like { 10, -1,  2 }
+    open (FH,'<',$file);
+    while (<FH>)
+    {
+        push @array, $_;
+    }
+
+    for (my $i = 1; $i < $#array; ++$i)
+    {
+        if ($array[$i] =~ ',( {2,3})[^ /]')
         {
-            print(($i + 1) . ":" . $array[$i]);
-            $ret = 1;
+            # https://stackoverflow.com/questions/87380/how-can-i-find-the-location-of-a-regex-match-in-perl
+
+            if ((substr($array[$i - 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/) # whitespaces are not part of alignment
+             && (substr($array[$i + 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/)
+             && $array[$i] !~ /(-?\d+\w*,\s+){3,}/) # this is not a number table like { 10, -1,  2 }
+            {
+                print($file . ":" . ($i + 1) . $array[$i]);
+                $ret = 1;
+            }
         }
     }
 }