diff --git a/pmd/rulesets/basic.xml b/pmd/rulesets/basic.xml
index 40a5b8313f..d812fc87b8 100644
--- a/pmd/rulesets/basic.xml
+++ b/pmd/rulesets/basic.xml
@@ -135,7 +135,8 @@ The Basic Ruleset contains a collection of good practices which everyone should
           <property name="xpath">
               <value>
                   <![CDATA[
-    //TryStatement[@Finally='true']/Block[position() = last()][count(*) = 0]
+    //TryStatement[@Finally='true']/Block[position() = last()]
+      [count(*) = 0]
                   ]]>
               </value>
           </property>
@@ -199,7 +200,8 @@ The Basic Ruleset contains a collection of good practices which everyone should
          <property name="xpath">
              <value>
                  <![CDATA[
-    //ForStatement[ForUpdate//Name/@Image = ancestor::ForStatement/ForInit//VariableDeclaratorId/@Image]
+    //ForStatement[ForUpdate//Name/@Image = 
+      ancestor::ForStatement/ForInit//VariableDeclaratorId/@Image]
                  ]]>
              </value>
          </property>
@@ -282,11 +284,14 @@ The Basic Ruleset contains a collection of good practices which everyone should
       [
       (@Image = 'equals'
           and count(FormalParameters/*) = 1
-          and not(//MethodDeclarator[count(FormalParameters/*) = 0][@Image = 'hashCode'])
+          and not(//MethodDeclarator[count(FormalParameters/*) = 0]
+          [@Image = 'hashCode'])
        or
       (@Image='hashCode'
           and count(FormalParameters/*) = 0
-          and not(//MethodDeclarator[count(FormalParameters//Type/Name[@Image = 'Object']) = 1][@Image = 'equals']))
+          and not(//MethodDeclarator[count(FormalParameters//Type/Name
+          [@Image = 'Object']) = 1]
+          [@Image = 'equals']))
       )]
                   ]]>
               </value>
diff --git a/pmd/rulesets/controversial.xml b/pmd/rulesets/controversial.xml
index 8b64302606..0950b831dd 100644
--- a/pmd/rulesets/controversial.xml
+++ b/pmd/rulesets/controversial.xml
@@ -19,7 +19,8 @@ most people really dislike :-)
             <property name="xpath">
                 <value>
                     <![CDATA[
-    //ConstructorDeclaration[1][position() = last()][@Public='true'][not(FormalParameters/*)][not(BlockStatement)]
+//ConstructorDeclaration[1][position() = last()][@Public='true']
+  [not(FormalParameters/*)][not(BlockStatement)]
                     ]]>
                 </value>
             </property>
@@ -120,7 +121,7 @@ most people really dislike :-)
             <property name="xpath">
                 <value>
                     <![CDATA[
-    //*[name()='WhileStatement' or name()='IfStatement'][Expression//AssignmentOperator]
+//*[name()='WhileStatement' or name()='IfStatement'][Expression//AssignmentOperator]
                     ]]>
                 </value>
             </property>
diff --git a/pmd/rulesets/junit.xml b/pmd/rulesets/junit.xml
index 38f2c5bde6..bdce96e812 100644
--- a/pmd/rulesets/junit.xml
+++ b/pmd/rulesets/junit.xml
@@ -15,7 +15,8 @@ These rules deal with different problems that can occur with JUnit tests.
         <property name="xpath">
             <value>
                 <![CDATA[
-  //MethodDeclaration[not(@Static='true') or not(@Public='true')][MethodDeclarator/@Image='suite']
+  //MethodDeclaration[not(@Static='true') or not(@Public='true')]
+   [MethodDeclarator/@Image='suite']
                 ]]>
             </value>
         </property>
@@ -44,7 +45,11 @@ These rules deal with different problems that can occur with JUnit tests.
       <property name="xpath">
           <value>
               <![CDATA[
-//MethodDeclarator[(not(@Image = 'setUp') and translate(@Image, 'SETuP', 'setUp') = 'setUp') or (not(@Image = 'tearDown') and translate(@Image, 'TEARdOWN', 'tearDown') = 'tearDown')][FormalParameters[count(*) = 0]]
+//MethodDeclarator[(not(@Image = 'setUp') 
+ and translate(@Image, 'SETuP', 'setUp') = 'setUp') 
+ or (not(@Image = 'tearDown') 
+ and translate(@Image, 'TEARdOWN', 'tearDown') = 'tearDown')]
+ [FormalParameters[count(*) = 0]]
               ]]>
           </value>
       </property>