diff --git a/pmd/etc/build.xml b/pmd/etc/build.xml
index 6f2e931268..0ebd5402fb 100644
--- a/pmd/etc/build.xml
+++ b/pmd/etc/build.xml
@@ -67,7 +67,12 @@
     </pmd>
 </target>
 
-<target name="test" depends="compile">
+  <target name="requires-junit">
+    <available classname="junit.framework.Test" property="junit.available"/>
+    <fail unless="junit.available" message="JUnit not available. Place a copy in CLASSPATH."/>
+  </target>
+
+<target name="test" depends="requires-junit,compile">
     <junit printsummary="yes" haltonfailure="yes">
       <classpath>
         <path refid="classpath.path" />
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index c1cbe6a136..fa3ff1b821 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -10,8 +10,8 @@
     <section name="Credits">
         <subsection name="Individuals">
         <ul>
+            <li>Paul Roebuck - Ant build improvement, several bug reports</li>
             <li>Jon A. Maxwell - Bug report</li>
-            <li>Paul Roebuck - Several bug reports</li>
             <li>Maik Schreiber - Bug report</li>
             <li>Erik Lee - Bug report</li>
             <li>Brandon Franklin - pmd-web suggestions</li>