diff --git a/pmd.xml b/pmd.xml
index 699d3acbf95..01b37fbd182 100644
--- a/pmd.xml
+++ b/pmd.xml
@@ -15,12 +15,14 @@
         </fileset>
     </path>
 
-    <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" 
+    <taskdef name="pmd" id="pmd" classname="net.sourceforge.pmd.ant.PMDTask" 
                         classpathref="pmd.classpath"/>
 
-    <target name="pmd" depends="pmd-data, pmd-core, pmd-standard, pmd-io, pmd-extra, pmd-render, pmd-applications, pmd-libio, pmd-experimental"/>
+    <target name="pmd" id="pmd" depends="pmd-data, pmd-core, pmd-standard, pmd-io, 
+        pmd-extra, pmd-render, pmd-applications, pmd-libio, pmd-experimental,
+        pmd-builder3d, pmd-test"/>
     
-    <target name="pmd-data">
+    <target name="pmd-data" id="pmd-data">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom-data.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/data.html"/>
@@ -30,7 +32,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-core">
+    <target name="pmd-core" id="pmd-core">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/core.html"/>
@@ -40,7 +42,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-standard">
+    <target name="pmd-standard" id="pmd-standard">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/standard.html"/>
@@ -50,7 +52,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-io">
+    <target name="pmd-io" id="pmd-io">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/io.html"/>
@@ -60,7 +62,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-render">
+    <target name="pmd-render" id="pmd-render">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/render.html"/>
@@ -70,7 +72,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-extra">
+    <target name="pmd-extra" id="pmd-extra">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/extra.html"/>
@@ -80,7 +82,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-applications">
+    <target name="pmd-applications" id="pmd-applications">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/applications.html"/>
@@ -90,7 +92,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-libio">
+    <target name="pmd-libio" id="pmd-libio">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/libio.html"/>
@@ -100,7 +102,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-experimental">
+    <target name="pmd-experimental" id="pmd-experimental">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/experimental.html"/>
@@ -110,7 +112,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-qsar">
+    <target name="pmd-qsar" id="pmd-qsar">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/qsar.html"/>
@@ -120,7 +122,7 @@
         </pmd>
     </target>
 
-    <target name="pmd-builder3d">
+    <target name="pmd-builder3d" id="pmd-builder3d">
         <mkdir dir="${reports.tests}/pmd"/>
         <pmd shortFilenames="true" rulesetfiles="pmd/custom.xml">
             <formatter type="summaryhtml" toFile="${reports.tests}/pmd/builder3d.html"/>
@@ -130,4 +132,14 @@
         </pmd>
     </target>
 
+    <target name="pmd-test" id="pmd-test">
+        <mkdir dir="${reports.tests}/pmd"/>
+        <pmd shortFilenames="true" rulesetfiles="pmd/custom-test.xml">
+            <formatter type="summaryhtml" toFile="${reports.tests}/pmd/test.html"/>
+            <fileset dir="${src}">
+                <includesfile name="${src}/test.javafiles"/>
+            </fileset>
+        </pmd>
+    </target>
+
 </project>
diff --git a/pmd/custom-data.xml b/pmd/custom-data.xml
index d177ef3a70c..8d82946ac11 100644
--- a/pmd/custom-data.xml
+++ b/pmd/custom-data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="custom">
+<ruleset name="custom-data">
 
   <description>
     This ruleset checks the CDK sources for bad code.
@@ -17,6 +17,8 @@
   <rule ref="rulesets/imports.xml"/>
   <rule ref="rulesets/strings.xml"/>
   <rule ref="rulesets/codesize.xml"/>
+  <rule ref="rulesets/strictexception.xml"/>
+  <rule ref="rulesets/clone.xml"/>
 
   <!-- Rules specific for CDK -->
 
diff --git a/pmd/custom-test.xml b/pmd/custom-test.xml
new file mode 100644
index 00000000000..6ceaf648840
--- /dev/null
+++ b/pmd/custom-test.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset name="custom">
+
+  <description>
+    This ruleset checks the CDK sources for bad code.
+  </description>
+
+  <!-- In the below paths, rulesets/ refers to the classpath, and the
+       pmd/ refers to this directory, and needs to be excluded because
+       the are called from ../pmd.xml -->
+
+  <!-- The rule sets that come with PMD -->
+
+  <rule ref="rulesets/basic.xml"/>
+  <rule ref="rulesets/unusedcode.xml"/>
+  <rule ref="rulesets/imports.xml"/>
+
+  <!-- Rules specific for CDK -->
+
+  <rule ref="pmd/customJunit.xml"/>
+
+</ruleset>
diff --git a/pmd/custom.xml b/pmd/custom.xml
index a9c2e6ed648..8c1c814f8f7 100644
--- a/pmd/custom.xml
+++ b/pmd/custom.xml
@@ -17,9 +17,11 @@
   <rule ref="rulesets/imports.xml"/>
   <rule ref="rulesets/strings.xml"/>
   <rule ref="rulesets/codesize.xml"/>
+  <rule ref="rulesets/strictexception.xml"/>
 
   <!-- Rules specific for CDK -->
 
   <rule ref="pmd/customCDK.xml"/>
+  <rule ref="pmd/customOptimization.xml"/>
 
 </ruleset>
diff --git a/pmd/customCDK.xml b/pmd/customCDK.xml
index 7704238cc1c..adf860dbc21 100644
--- a/pmd/customCDK.xml
+++ b/pmd/customCDK.xml
@@ -19,12 +19,28 @@
           <![CDATA[
 //TryStatement[@Catch='true'][not(FormalParameter/following-sibling::Block//Name[@Image='logger.debug'])]
           ]]>
-<!-- old one:
-//TryStatement[@Catch='true']//StatementExpression/PrimaryExpression[PrimaryPrefix/Name/@Image = 'logger.debug'][PrimarySuffix/Arguments//Name[@Image = ../../../../../../../../../../../../FormalParameter/VariableDeclaratorId/@Image]][count(*) = 0]
--->
         </value>
         </property>
     </properties>
   </rule>
 
+  <rule name="CDK_MoreThanOneLoggingToolInstantiated"
+        message="More than one LoggingTool is instantiated"
+        class="net.sourceforge.pmd.rules.XPathRule">
+    <description>
+      Detects instantiation of more than one LoggingTool.
+    </description>
+    <priority>3</priority>
+    <properties>
+      <property name="xpath" pluginname="true">
+        <value>
+          <![CDATA[
+//ClassBody[count(//VariableDeclarator[../Type/Name[@Image='LoggingTool']]) &gt;1 ]
+          ]]>
+        </value>
+        </property>
+    </properties>
+  </rule>
+
+
 </ruleset>
diff --git a/pmd/customJunit.xml b/pmd/customJunit.xml
new file mode 100644
index 00000000000..cae216c357a
--- /dev/null
+++ b/pmd/customJunit.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset name="customJunit">
+
+  <description>
+    This ruleset checks the CDK sources for bad code.
+  </description>
+
+  <rule ref="rulesets/junit.xml">
+    <exclude name="JUnitAssertionsShouldIncludeMessage"/>
+  </rule>
+
+</ruleset>
diff --git a/pmd/customOptimization.xml b/pmd/customOptimization.xml
new file mode 100644
index 00000000000..5cb83db282e
--- /dev/null
+++ b/pmd/customOptimization.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset name="customOptimization">
+
+  <description>
+    This ruleset checks the CDK sources for bad code.
+  </description>
+
+  <rule ref="rulesets/junit.xml">
+    <exclude name="MethodArgumentCouldBeFinal"/>
+  </rule>
+
+</ruleset>