diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTaskTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTaskTest.java
new file mode 100644
index 000000000..a8123b451
--- /dev/null
+++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTaskTest.java
@@ -0,0 +1,86 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.apache.tools.ant.taskdefs.optional.junit;
+
+import java.io.File;
+import java.net.URL;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+
+/**
+ *
+ * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
+ */
+public class RJUnitTaskTest extends BuildFileTest {
+    public RJUnitTaskTest(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        configureProject("data/build-test.xml");
+    }
+
+    protected void configureProject(String resource){
+        URL url = getClass().getResource(resource);
+        assertNotNull("Could not find resource :" + resource, url);
+        super.configureProject(url.getFile());
+    }
+
+    public void testServerAndClient(){
+        executeTarget("server-and-client");
+        System.out.println(getFullLog());
+    }
+}
diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java
index 310e4a968..0983211db 100644
--- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java
+++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java
@@ -60,7 +60,7 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.framework.TestListener;
 
-import org.apache.tools.ant.taskdefs.optional.junit.formatter.DefaultTestRunListener;
+import org.apache.tools.ant.taskdefs.optional.junit.formatter.PlainFormatter;
 import org.apache.tools.ant.taskdefs.optional.junit.TestRunListener;
 import org.apache.tools.ant.taskdefs.optional.junit.TestRunRecorder;
 
@@ -114,7 +114,7 @@ public class TestRunnerTest extends TestCase
 
     public void testNullTestCase() throws Exception {
         runner.addTestClassName(TestCases.NullTestCase.class.getName());
-//        server.addListener( new DefaultTestRunListener() );
+//        server.addListener( new PlainFormatter() );
         runner.run();
         synchronized(this){ while (!done){ wait(); } }
         assertEquals(new Integer(3), recorder.runStarted.elementAt(0));