diff --git a/WHATSNEW b/WHATSNEW
index e3037851b..5dbdd650f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -61,6 +61,10 @@ Other changes:
 
 * New condition <isreference>
 
+* <junit> will now return the result of a call to getName instead of
+  "unknown" for Test implementations that don't extend TestCase but have
+  a public String getName() method.
+
 Changes from Ant 1.5beta3 to Ant 1.5
 ====================================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
index 1f2f5165a..d5335fdfc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
@@ -84,12 +84,24 @@ public class JUnitVersionHelper {
      * of JUnit remove the old name() method.  This method provides
      * access to the name of a TestCase via reflection that is
      * supposed to work with version before and after JUnit 3.7.
+     *
+     * <p>since Ant 1.5.1 this method will invoke &quot;<code>public
+     * String getName()</code>&quot; on any implementation of Test if
+     * it exists.</p>
      */
     public static String getTestCaseName(Test t) {
         if (t instanceof TestCase && testCaseName != null) {
             try {
                 return (String) testCaseName.invoke(t, new Object[0]);
             } catch (Throwable e) {}
+        } else {
+            try {
+                Method getNameMethod = 
+                    t.getClass().getMethod("getName", new Class [0]);
+                if (getNameMethod.getReturnType() == String.class) {
+                    return (String) getNameMethod.invoke(t, new Object[0]);
+                }
+            } catch (Throwable e) {}
         }
         return "unknown";
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java
new file mode 100644
index 000000000..405285195
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+
+/**
+ * @version $Revision$
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ */
+public class JUnitVersionHelperTest extends TestCase {
+
+    public JUnitVersionHelperTest(String name) {
+        super(name);
+    }
+
+    public void testMyOwnName() {
+        assertEquals("testMyOwnName", 
+                     JUnitVersionHelper.getTestCaseName(this));
+    }
+
+    public void testNonTestCaseName() {
+        assertEquals("I'm a foo", 
+                     JUnitVersionHelper.getTestCaseName(new Foo1()));
+    }
+
+    public void testNoStringReturn() {
+        assertEquals("unknown", 
+                     JUnitVersionHelper.getTestCaseName(new Foo2()));
+    }
+
+    public void testNoGetName() {
+        assertEquals("unknown", 
+                     JUnitVersionHelper.getTestCaseName(new Foo3()));
+    }
+
+    public void testNull() {
+        assertEquals("unknown", JUnitVersionHelper.getTestCaseName(null));
+    }
+
+    public static class Foo implements Test {
+        public int countTestCases() {return 0;}
+        public void run(TestResult result) {}
+    }
+
+    public static class Foo1 extends Foo {
+        public String getName() {return "I'm a foo";}
+    }
+
+    public static class Foo2 extends Foo {
+        public int getName() {return 1;}
+    }
+
+    public static class Foo3 extends Foo {
+    }
+}