diff --git a/src/tests/antunit/types/build-embedded-ref.xml b/src/tests/antunit/types/build-embedded-ref.xml
new file mode 100644
index 000000000..9298a2dc4
--- /dev/null
+++ b/src/tests/antunit/types/build-embedded-ref.xml
@@ -0,0 +1,3 @@
+<project default="all">
+  <target name="all"/>
+</project>
diff --git a/src/tests/antunit/types/defer-reference-test.xml b/src/tests/antunit/types/defer-reference-test.xml
new file mode 100644
index 000000000..c626df51c
--- /dev/null
+++ b/src/tests/antunit/types/defer-reference-test.xml
@@ -0,0 +1,61 @@
+<project default="all" xmlns:au="antlib:org.apache.ant.antunit">
+  <target name="notcalled">
+    <filelist id="ref1" dir="${basedir}" files="xxx" />
+  </target>
+  
+  <target name="test-notcalled">
+    <!-- bug 36955 -->
+    <au:expectfailure>
+      <pathconvert property="_output2" refid="ref1"
+                   pathsep="${line.separator}" />
+    </au:expectfailure>
+  </target>
+
+  <target name="test-macrodef-embedded-ref">
+    <!-- bug 34458 -->
+    <macrodef name="foo">
+      <element name="nested" implicit="yes" optional="yes"/>
+      <sequential>
+        <fileset id="abc" dir=".">
+          <nested/>
+        </fileset>
+      </sequential>
+    </macrodef>
+
+    <ant antfile="build-embedded-ref.xml" inheritRefs="true"/>
+  </target>
+
+  <condition property="allow.script">
+    <and>
+      <available classname="org.apache.bsf.BSFManager" />
+      <available classname="bsh.StringUtil" />
+    </and>
+  </condition>
+
+  <target name="test-script" if="allow.script">
+    <!-- bugzilla: 37688 -->
+    <macrodef name="compileMapper" >
+      <attribute name="objDir" />
+      <attribute name="id" default="compileMapperID" />
+      <sequential>
+        <mkdir dir="@{objDir}"/>
+        <mapper id="@{id}">
+          <chainedmapper  >
+            <flattenmapper/>
+            <globmapper from="*" to="@{objDir}/*.o"/>
+          </chainedmapper>
+        </mapper>
+      </sequential>
+    </macrodef>
+    <script language="beanshell"/>
+  </target>
+
+  <target name="all">
+    <au:antunit>
+      <fileset file="${ant.file}"/>
+      <au:plainlistener/>
+    </au:antunit>
+  </target>
+
+  
+</project>