diff --git a/src/etc/testcases/taskdefs/macrodef.xml b/src/etc/testcases/taskdefs/macrodef.xml
new file mode 100644
index 000000000..72a88a511
--- /dev/null
+++ b/src/etc/testcases/taskdefs/macrodef.xml
@@ -0,0 +1,47 @@
+<project>
+
+  <target name="simple">
+    <macrodef name="my.echo">
+      <param name="text"/>
+      <sequential>
+        <echo message="${text}"/>
+      </sequential>
+    </macrodef>
+    <my.echo text="Hello World"/>
+  </target>
+
+  <target name="text">
+    <macrodef name="my.echo">
+      <param name="text"/>
+      <sequential>
+        <echo>${text}</echo>
+      </sequential>
+    </macrodef>
+    <my.echo text="Inner Text"/>
+  </target>
+
+  <target name="uri">
+    <macrodef name="echo" uri="abc">
+      <param name="text"/>
+      <sequential>
+        <echo message="${text}"/>
+      </sequential>
+    </macrodef>
+    <x:echo xmlns:x="abc" text="Hello World"/>
+  </target>
+
+  <target name="nested">
+    <macrodef name="nested">
+      <element name="nested"/>
+      <sequential>
+        <nested/>
+      </sequential>
+    </macrodef>
+
+    <nested>
+      <nested>
+        <echo>A nested element</echo>
+      </nested>
+    </nested>
+  </target>
+</project>
diff --git a/src/etc/testcases/taskdefs/presetdef.xml b/src/etc/testcases/taskdefs/presetdef.xml
new file mode 100644
index 000000000..f62373409
--- /dev/null
+++ b/src/etc/testcases/taskdefs/presetdef.xml
@@ -0,0 +1,20 @@
+<project>
+  <target name="simple">
+    <presetdef name="my.echo">
+      <echo message="Hello world"/>
+    </presetdef>
+    <my.echo/>
+  </target>
+  <target name="text">
+    <presetdef name="my.echo">
+      <echo>Inner Text</echo>
+    </presetdef>
+    <my.echo/>
+  </target>
+  <target name="uri">
+    <presetdef name="echo" uri="abc">
+      <echo message="Hello world"/>
+    </presetdef>
+    <x:echo xmlns:x="abc"/>
+  </target>
+</project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
new file mode 100644
index 000000000..df1893fd5
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
@@ -0,0 +1,89 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 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 "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;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+ * @author Peter Reilly
+ */
+public class MacroDefTest extends BuildFileTest {
+    public MacroDefTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/macrodef.xml");
+    }
+
+    public void testSimple() {
+        expectLog("simple", "Hello World");
+    }
+
+    public void testText() {
+        expectLog("text", "Inner Text");
+    }
+
+    public void testUri() {
+        expectLog("uri", "Hello World");
+    }
+
+    public void testNested() {
+        expectLog("nested", "A nested element");
+    }
+}
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java
new file mode 100644
index 000000000..2bce11a2d
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java
@@ -0,0 +1,86 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 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 "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;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+ * @author Peter Reilly
+ */
+public class PreSetDefTest extends BuildFileTest {
+    public PreSetDefTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/presetdef.xml");
+    }
+
+    public void testSimple() {
+        expectLog("simple", "Hello world");
+    }
+
+    public void testText() {
+        expectLog("text", "Inner Text");
+    }
+
+    public void testUri() {
+        expectLog("uri", "Hello world");
+    }
+
+}
+