diff --git a/checkstyle/src/plugin-test/checkstyle.xml b/checkstyle/src/plugin-test/checkstyle.xml
index 3c6b525b..b7e3efca 100644
--- a/checkstyle/src/plugin-test/checkstyle.xml
+++ b/checkstyle/src/plugin-test/checkstyle.xml
@@ -4,14 +4,40 @@
     "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
 
 <module name="Checker">
+
+  <module name="PackageHtml">
+      <property name="severity" value="info"/>
+  </module>
+
   <property name="severity" value="error"/>
 
   <module name="TreeWalker">
 
+    <module name="JavadocType">
+        <property name="severity" value="warning"/>
+    </module>
+    <module name="JavadocVariable">
+        <property name="scope" value="protected"/>
+        <property name="severity" value="info"/>
+    </module>
+
     <module name="IllegalInstantiation">
       <property name="classes" value="java.lang.Boolean"/>
     </module>
   
+    <module name="GenericIllegalRegexp">
+      <property name="format" value="\s+$"/>
+      <property name="message" value="Line has trailing spaces."/>
+    </module>
+    <module name="GenericIllegalRegexp">
+      <property name="format" value="\s+$"/>
+      <property name="message" value="This has to be the second message about trailing spaces."/>
+    </module>
+
+    <module name="LineLength">
+        <property name="max" value="60"/>
+    </module>
+
   </module>
 
   <module name="SuppressionFilter">
diff --git a/checkstyle/src/plugin-test/src/main/org/apache/maven/BreakTrailingSpaces.java b/checkstyle/src/plugin-test/src/main/org/apache/maven/BreakTrailingSpaces.java
new file mode 100644
index 00000000..6f289166
--- /dev/null
+++ b/checkstyle/src/plugin-test/src/main/org/apache/maven/BreakTrailingSpaces.java
@@ -0,0 +1,8 @@
+package org.apache.maven;
+
+public class BreakTrailingSpaces
+{
+    // Voluntarily adding trailing spaces
+    
+    public String x;
+} 
\ No newline at end of file