diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java
index 132a6de8c..662a885a8 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClientElement.java
@@ -163,8 +163,9 @@ public final class ClientElement extends ProjectComponent {
      * @return all collected tests specified with test elements.
      */
     protected Enumeration collectTests() {
-        Enumeration[] tests = new Enumeration[testCollectors.size()];
-        for (int i = 0; i < testCollectors.size(); i++) {
+        final int count = testCollectors.size();
+        final Enumeration[] tests = new Enumeration[count];
+        for (int i = 0; i < count; i++) {
             TestCollector te = (TestCollector) testCollectors.get(i);
             tests[i] = te.collectTests();
         }
@@ -241,7 +242,7 @@ public final class ClientElement extends ProjectComponent {
 
     /** classpath to be set for running tests */
     public Path createClasspath() {
-        return cmd.createClasspath(project);
+        return cmd.createClasspath(getProject());
     }
 
     /** add a single test element */
diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java
index 2e8d98a2d..3e770c60e 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ResultFormatterElement.java
@@ -53,17 +53,14 @@
  */
 package org.apache.tools.ant.taskdefs.optional.rjunit;
 
-import java.io.OutputStream;
 import java.io.File;
+import java.io.OutputStream;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.BriefFormatter;
 import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.Formatter;
-import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.XMLFormatter;
-import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.PlainFormatter;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
@@ -178,8 +175,8 @@ public class ResultFormatterElement {
 
         // create properties from parameters
         Properties props = new Properties();
-        for (int i = 0; i < params.size(); i++){
-            Parameter param = (Parameter)params.elementAt(i);
+        for (int i = 0; i < params.size(); i++) {
+            Parameter param = (Parameter) params.elementAt(i);
             props.put(param.getName(), param.getValue());
         }
         // it is assumed here that the filters are chaining til the
@@ -194,7 +191,11 @@ public class ResultFormatterElement {
      */
     public final static class TypeAttribute extends EnumeratedAttribute {
         private final static String[] VALUES = {"plain", "xml", "brief"};
-        private final static String[] CLASSNAMES = {PlainFormatter.class.getName(), XMLFormatter.class.getName(), BriefFormatter.class.getName()};
+        private final static String[] CLASSNAMES = {
+            "org.apache.tools.ant.taskdefs.optional.rjunit.formatter.PlainFormatter",
+            "org.apache.tools.ant.taskdefs.optional.rjunit.formatter.XMLFormatter",
+            "org.apache.tools.ant.taskdefs.optional.rjunit.formatter.BriefFormatter"
+        };
 
         public String[] getValues() {
             return VALUES;
diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java
index eaa40d4c7..0ef9dd9ad 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ServerElement.java
@@ -110,9 +110,10 @@ public final class ServerElement extends ProjectComponent {
         // and run it. It will stop once a client has finished.
         try {
             server.start(false); // do not loop
-            server.shutdown();
         } catch (IOException e) {
             throw new BuildException(e);
+        } finally {
+            server.shutdown();
         }
     }