diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java
index 8862d1571..62d45fab4 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/ClasspathTestCollector.java
@@ -122,8 +122,8 @@ public final class ClasspathTestCollector extends ProjectComponent
         Project project = getProject();
         DirectoryScanner ds = new DirectoryScanner();
         ds.setBasedir(dir);
-        ds.setIncludes(patterns.getIncludePatterns(getProject()));
-        ds.setExcludes(patterns.getExcludePatterns(getProject()));
+        ds.setIncludes(patterns.getIncludePatterns(project));
+        ds.setExcludes(patterns.getExcludePatterns(project));
         ds.scan();
         String[] included = ds.getIncludedFiles();
         return testClassNameFromFile(included);
diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java
index 75e57001d..dfcbef4b6 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/JUnitHelper.java
@@ -81,7 +81,6 @@ public final class JUnitHelper {
      */
     public static String getTestName(String text){
         int p1 = text.indexOf('(');
-        int p2 = text.indexOf(')', p1);
         return text.substring(0, p1);
     }
 
@@ -118,7 +117,6 @@ public final class JUnitHelper {
     /**
      * Extract a test from a given class
      * @param clazz the class to extract a test from.
-     * @throws Exception a generic exception
      */
     public static Test getTest(Class clazz) {
         try {
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 95cf782ff..2e8d98a2d 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
@@ -117,7 +117,6 @@ public class ResultFormatterElement {
     /**
      * Setting a comma separated list of filters in the specified order.
      * @see #addFilter(FilterElement)
-     * @see FilterAttribute
      */
     public void setFilters(String filters) {
         StringTokenizer st = new StringTokenizer(filters, ",");
diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java
index 253de08a3..320532dbd 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatter.java
@@ -127,7 +127,7 @@ public class FilterStackFormatter extends FilterFormatter {
     }
     /**
      * Check whether or not the line should be accepted.
-     * @param the line to be check for acceptance.
+     * @param line the line to be check for acceptance.
      * @return <tt>true</tt> if the line is accepted, <tt>false</tt> if not.
      */
     protected boolean accept(String line) {
diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java
index c0addef1f..6a38ec7ee 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/XMLFormatter.java
@@ -211,6 +211,11 @@ public class XMLFormatter extends BaseStreamFormatter {
         String name = JUnitHelper.getTestName(evt.getName());
         test.setAttribute(ATTR_NAME, name);
         String suiteName = JUnitHelper.getSuiteName(evt.getName());
+        if ( !suiteName.equals(lastSuiteElement.getAttribute("name")) ){
+            throw new BuildException("Received testcase from test "
+                    + suiteName + " and was expecting "
+                    + lastSuiteElement.getAttribute("name"));
+        }
         lastSuiteElement.appendChild(test);
         lastTestElement = test;
         lastTestEvent = evt;