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
new file mode 100644
index 000000000..c862abdd6
--- /dev/null
+++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java
@@ -0,0 +1,179 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 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.remote;
+
+import java.util.Vector;
+import java.util.Properties;
+
+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.TestRunListener;
+import org.apache.tools.ant.taskdefs.optional.junit.TestRunRecorder;
+
+/**
+ * TestCase for the test runner.
+ *
+ * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
+ */
+public class TestRunnerTest extends TestCase
+        implements TestRunListener {
+
+    public final static int PORT = 1234;
+
+    protected Server server;
+
+    protected TestRunner runner;
+
+    protected TestRunRecorder recorder;
+
+    protected boolean done;
+
+    public TestRunnerTest(String s) {
+        super(s);
+    }
+
+    protected void setUp() throws Exception {
+        server = createServer();
+        server.start();
+        runner = createClient();
+        recorder = new TestRunRecorder();
+        server.addListener( recorder );
+        server.addListener( this );
+    }
+
+    protected void tearDown() throws Exception {
+        server.shutdown();
+        runner.stop();
+    }
+
+    protected Server createServer() throws Exception {
+        return new Server(PORT);
+    }
+
+    protected TestRunner createClient() throws Exception {
+        TestRunner client = new TestRunner();
+        client.setDebug(true);
+        client.setHost("127.0.0.1");
+        client.setPort(PORT);
+        return client;
+    }
+
+    public void testNullTestCase() throws Exception {
+        runner.addTestClassName(TestCases.NullTestCase.class.getName());
+//        server.addListener( new DefaultTestRunListener() );
+        runner.run();
+        synchronized(this){ if (!done){ wait(); } }
+        assertEquals(new Integer(3), recorder.runStarted.elementAt(0));
+        /*
+        assertTrue(recorder.runStarted.elementAt(0).toSt("testSuccess"));
+        assertTrue(started.contains("testFailure"));
+        assertTrue(started.contains("testError"));*/
+
+    }
+
+    public void testFailSetupTestCase() throws Exception {
+        runner.addTestClassName(TestCases.FailSetupTestSuite.class.getName());
+        runner.run();
+        synchronized(this){ if (!done){ wait(); } }
+
+        assertEquals(1, recorder.runStarted.size());
+        assertEquals(1, recorder.runEnded.size());
+    }
+
+    public void testFailSetupTestSuite() throws Exception {
+        runner.addTestClassName(TestCases.FailSetupTestSuite.class.getName());
+        runner.run();
+        synchronized(this){ if (!done){ wait(); } }
+        assertEquals(1, recorder.runStarted.size());
+        assertEquals(1, recorder.runEnded.size());
+    }
+
+    public static void main(String[] args){
+        TestSuite suite = new TestSuite(TestRunnerTest.class);
+        junit.textui.TestRunner.run(suite);
+    }
+
+// TestRunListener implementation
+    public void onTestStarted(String testname) {
+    }
+    public void onTestEnded(String testname) {
+    }
+    public void onTestFailed(int status, String testname, String trace) {
+    }
+    public void onTestRunStarted(int count) {
+    }
+    public void onTestRunEnded(long elapsedtime) {
+        synchronized(this){
+            done = true;
+        }
+        notify();
+    }
+    public void onTestRunStopped(long elapsedtime) {
+        synchronized(this){
+            done = true;
+        }
+        notify();
+    }
+    public void onTestRunSystemProperties(Properties props) {
+    }
+
+    public void onTestStdOutLine(String testname, String line) {
+    }
+
+    public void onTestStdErrLine(String testname, String line) {
+    }
+}