diff --git a/cq-configs/checkstyle/checkstyle.xml b/cq-configs/checkstyle/checkstyle.xml
index 06539c74110b..cbaf7fe1d222 100644
--- a/cq-configs/checkstyle/checkstyle.xml
+++ b/cq-configs/checkstyle/checkstyle.xml
@@ -38,7 +38,7 @@
        <property name="minimum" value="0"/>
        <property name="maximum" value="0"/>
        <property name="message" value="Line has trailing spaces."/>
-       <property name="severity" value="info"/>
+       <property name="severity" value="error"/>
     </module>
 
 
@@ -58,6 +58,12 @@
       <property name="min" value="25"/>
     </module>
 
+    <module name="RegexpSingleline">
+      <property name="format" value="\/\/[^ \t]"/>
+      <property name="message" value="Line comments '//' must be followed by one whitespace"/>
+      <property name="severity" value="error"/>
+    </module>
+
     <module name="TreeWalker">
 
         <!-- Checks for Javadoc comments.                     -->
@@ -212,6 +218,8 @@
           <property name="format" value="FIXME"/>
           <property name="severity" value="warning"/>
         </module>
+        <module name="TrailingComment"/>
+
         <module name="UpperEll"/>
 
         <module name="FileContentsHolder"/> <!-- Required by comment suppression filters -->
diff --git a/tools/compare-with-develop-style.sh b/tools/compare-with-develop-style.sh
index f9464da59959..02fafeb3953a 100755
--- a/tools/compare-with-develop-style.sh
+++ b/tools/compare-with-develop-style.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+CONFIG_FILE=cq-configs/checkstyle/checkstyle.xml
+cp $CONFIG_FILE /tmp/checkstyle.xml
+
 if [ x"$1" == x ]; then
 	compared_branch=develop
 fi
@@ -12,13 +15,13 @@ current_branch_filtered=$(echo $current_branch | tr "/" "-")
 modified_files=$(git --no-pager diff develop --name-only | grep ".java$")
 
 # Check style on current branch
-checkstyle -c cq-configs/checkstyle/checkstyle.xml $modified_files > /tmp/checkstyle-$current_branch_filtered.log
+checkstyle -c /tmp/checkstyle.xml $modified_files | sed "s/:[0-9]*//g" > /tmp/checkstyle-$current_branch_filtered.log
 
 # Check style on current develop
 git stash | grep "No local changes to save" > /dev/null
 needpop=$?
 git checkout $compared_branch
-checkstyle -c cq-configs/checkstyle/checkstyle.xml $modified_files > /tmp/checkstyle-develop.log
+checkstyle -c /tmp/checkstyle.xml $modified_files | sed "s/:[0-9]*//g" > /tmp/checkstyle-develop.log
 
 # Back on current branch
 git checkout $current_branch
@@ -26,7 +29,10 @@ git checkout $current_branch
 echo
 echo --------------------------
 echo The following warnings seem to be introduced by your branch:
-diff -u /tmp/checkstyle-develop.log /tmp/checkstyle-$current_branch_filtered.log | grep "^+" | grep -v "^+++"
+diff -u /tmp/checkstyle-develop.log /tmp/checkstyle-$current_branch_filtered.log > /tmp/checkstyle.diff
+cat /tmp/checkstyle.diff | grep "^+" | grep -v "^+++" || echo Yay no new style errors!!
+echo Style errors removed:
+cat /tmp/checkstyle.diff | grep "^-" | wc -l
 
 # restore local changes
 if [ $needpop -eq 1 ]; then