diff --git a/src/etc/testcases/core/location.xml b/src/etc/testcases/core/location.xml
index 80ae9d7ba..33608738b 100644
--- a/src/etc/testcases/core/location.xml
+++ b/src/etc/testcases/core/location.xml
@@ -35,4 +35,29 @@
     </condition>
   </target>
 
+  <target name="define">
+    <property name="testclasses"
+      location="../../../../build/testcases" />
+    <taskdef name="echoloc"
+      classname="org.apache.tools.ant.LocationTest$EchoLocation">
+      <classpath>
+        <pathelement location="${testclasses}" />
+        <pathelement path="${java.class.path}"/>
+      </classpath>
+    </taskdef>
+  </target>
+
+  <target name="macrodef" depends="define">
+    <macrodef name="echoloc2" backtrace="false">
+      <sequential>
+        <echoloc/>
+      </sequential>
+    </macrodef>
+  </target>
+
+  <target name="testMacrodefWrappedTask" depends="macrodef">
+    <echo id="echo3">Hello</echo>
+    <echoloc2/>
+  </target>
+
 </project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/LocationTest.java b/src/testcases/org/apache/tools/ant/LocationTest.java
index 808c6f4f2..917f6598f 100644
--- a/src/testcases/org/apache/tools/ant/LocationTest.java
+++ b/src/testcases/org/apache/tools/ant/LocationTest.java
@@ -51,4 +51,19 @@ public class LocationTest extends BuildFileTest {
         assertFalse(c.getLocation() == Location.UNKNOWN_LOCATION);
         assertFalse(c.getLocation().getLineNumber() == 0);
     }
-}
\ No newline at end of file
+
+    public void XtestMacrodefWrappedTask() {
+        executeTarget("testMacrodefWrappedTask");
+        Echo e = (Echo) getProject().getReference("echo3");
+        assertTrue(getLog().indexOf("Line: " 
+                                    + (e.getLocation().getLineNumber() + 1))
+                   > -1);
+    }
+
+    public static class EchoLocation extends Task {
+        public void execute() {
+            log("Line: " + getLocation().getLineNumber(), Project.MSG_INFO);
+        }
+    }
+}
+