diff --git a/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml b/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
index f35faeef939..a652dd011a0 100644
--- a/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
+++ b/build-tools-root/checkstyles/src/main/resources/checkstyle-suppressions.xml
@@ -92,6 +92,9 @@
     <suppress checks="IllegalType" files="ConvergenceScheduleTest.java"/>
     <suppress checks="IllegalType" files="AbstractBackendBaseTest.java"/>
 
+    <!-- Visually better with multiple spaces -->
+    <suppress checks="SingleSpaceSeparator" files="NetworkStatisticsBuilderTest.java"/>
+
     <!-- Most of the classes in the authentication package aren't used in the
          GWT client, and those that are used have special versions or custom
          field serializers to overcome the GWT serialization limitations. All
diff --git a/build-tools-root/checkstyles/src/main/resources/checkstyle.xml b/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
index a94ae5b906e..e40ac1e7600 100644
--- a/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
+++ b/build-tools-root/checkstyles/src/main/resources/checkstyle.xml
@@ -21,7 +21,6 @@
   </module>
   <module name="UniqueProperties"/>
   <module name="TreeWalker">
-
     <!-- Built-in checks -->
     <module name="AnnotationLocation" />
     <module name="AnnotationUseStyle" />
@@ -68,6 +67,7 @@
     <module name="RedundantImport"/>
     <module name="RightCurly" />
     <module name="SimplifyBooleanExpression"/>
+    <module name="SingleSpaceSeparator"/>
     <module name="StringLiteralEquality"/>
     <module name="SuppressionXpathSingleFilter">
       <property name="checks" value="IllegalType"/>
@@ -77,9 +77,8 @@
     <module name="UnnecessaryParentheses"/>
     <module name="UnusedImports"/>
     <module name="UpperEll"/>
-    <module name="WhitespaceAfter">
-          <property name="tokens" value="COMMA"/>
-    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround"/>
 
     <!-- oVirt checks -->
     <module name="org.ovirt.checkstyle.checks.DiamondOperatorCheck"/>