diff --git a/buildtools/src/main/resources/cxf-checkstyle-corba.xml b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
index 11ec9ce..8bc42da 100644
--- a/buildtools/src/main/resources/cxf-checkstyle-corba.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
@@ -125,7 +125,11 @@
 			<property name="tokens"
 				value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS" />
 		</module>
-		<module name="NoWhitespaceBefore" />
+		<module name="NoWhitespaceBefore">
+            <property name="tokens"
+                value="COMMA, SEMI, POST_INC, POST_DEC" />
+        </module>
+
 		<module name="OperatorWrap" />
 		<module name="ParenPad" />
 		<module name="TypecastParenPad" />
diff --git a/buildtools/src/main/resources/cxf-checkstyle.xml b/buildtools/src/main/resources/cxf-checkstyle.xml
index e26f41f..5aedf6b 100644
--- a/buildtools/src/main/resources/cxf-checkstyle.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle.xml
@@ -122,7 +122,10 @@
 			<property name="tokens"
 				value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS" />
 		</module>
-		<module name="NoWhitespaceBefore" />
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+                value="COMMA, SEMI, POST_INC, POST_DEC" />
+        </module>
 		<module name="OperatorWrap" />
 		<module name="ParenPad" />
 		<module name="TypecastParenPad" />