diff --git a/src/tests/antunit/taskdefs/xmlproperty-test.xml b/src/tests/antunit/taskdefs/xmlproperty-test.xml
index 6b1407c54..0b744b9c0 100644
--- a/src/tests/antunit/taskdefs/xmlproperty-test.xml
+++ b/src/tests/antunit/taskdefs/xmlproperty-test.xml
@@ -6,6 +6,7 @@
       <equals arg1="" arg2="${project.description}"/>
     </au:assertTrue>
   </target>
+
   <target name="test-multi">
     <property name="root.element.value" value="original"/>
     <xmlproperty file="xmlproperty.multi.xml" collapseAttributes="yes"/>
@@ -13,5 +14,31 @@
       <equals arg1="original" arg2="${root.element.value}"/>
     </au:assertTrue>
   </target>
+
+  <target name="testInlineExpansion">
+    <xmlproperty
+        file="xmlproperty.inline-expansion.xml"
+        collapseAttributes="true"
+        keepRoot="false"
+        semanticAttributes="true"/>
+    <echo>
+ element      expected    actual
+    p         ${app.n}    ${app.p}
+    n            n        ${app.n}
+    o            n        ${app.o}
+    m            n        ${app.m}
+    </echo>
+    <au:assertPropertyEquals name="app.p" value="${app.n}"/>
+    <au:assertPropertyEquals name="app.n" value="n"/>
+    <au:assertPropertyEquals name="app.o" value="n"/>
+    <au:assertPropertyEquals name="app.m" value="n"/>
+    <au:assertEquals actual="${app.n}" expected="n"/>
+    <au:assertEquals actual="${app.o}" expected="n"/>
+    <au:assertEquals actual="${app.m}" expected="n"/>
+    <fail>
+      <not> 
+      </not>
+    </fail>
+  </target>
 </project>
 
diff --git a/src/tests/antunit/taskdefs/xmlproperty.inline-expansion.xml b/src/tests/antunit/taskdefs/xmlproperty.inline-expansion.xml
new file mode 100644
index 000000000..e4be81c8d
--- /dev/null
+++ b/src/tests/antunit/taskdefs/xmlproperty.inline-expansion.xml
@@ -0,0 +1,16 @@
+<root-tag>
+  <!--used to check that the ordering of attribute expansion/eval is the order of
+  declaration in the build file, not alphabetical
+
+    expectations are
+      p : ${app.n}
+      n : n
+      o : n
+      m : n
+  -->
+  <app
+      p="${app.n}"
+      n="n"
+      o="${app.n}"
+      m="${app.n}"/>
+</root-tag>
\ No newline at end of file