diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 35fd9ea4f0..f3e3fb44d8 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -35,6 +35,11 @@
 -->
         <module name="ModifierOrder"/>
         <module name="MultipleVariableDeclarations"/>
+        <module name="NoWhitespaceAfter">
+            <!-- ARRAY_INIT disabled -->
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+        </module>
+        <module name="NoWhitespaceBefore"/>
         <module name="RedundantImport"/>
         <module name="RedundantModifier">
             <!-- VARIABLE_DEF disabled -->