diff --git a/Spring.build b/Spring.build
index fe09c001..9b00dc03 100644
--- a/Spring.build
+++ b/Spring.build
@@ -116,10 +116,10 @@ Commandline Examples:
   <property name="doc.sdk" value="false"/>
 
   <!-- turn on all tests if test.full specified -->
-  <property name="test.full" value="false" />
-  <property name="test.integration.data" value="${test.full}" />
-  <property name="test.integration.ems" value="${test.full}" />
-  <property name="test.integration.nms" value="${test.full}" />
+  <property name="test.full" value="false" overwrite="false" />
+  <property name="test.integration.data" value="${test.full}" overwrite="false" />
+  <property name="test.integration.ems" value="${test.full}" overwrite="false" />
+  <property name="test.integration.nms" value="${test.full}" overwrite="false" />
 
   <!--
       the line below is for the ccnet build box - see target set-user-overrides for how to change this to your machine values if necessary
@@ -1400,9 +1400,9 @@ Commandline Examples:
   </target>
   <target name="set-build-namespaces-all">
     <property name="build.allnamespaces" value="true"/>
-    <property name="test.integration.data" value="false" />
-    <property name="test.integration.ems" value="false" />
-    <property name="test.integration.nms" value="false" />
+    <property name="test.integration.data" value="false" overwrite="false" />
+    <property name="test.integration.ems" value="false" overwrite="false" />
+    <property name="test.integration.nms" value="false" overwrite="false" />
     <property name="build-aop" value="true" />
     <property name="build-data" value="true" />
     <property name="build-services" value="true" />
@@ -1439,9 +1439,9 @@ Commandline Examples:
     </fileset>
   </target>
   <target name="set-build-namespaces-release">
-    <property name="test.integration.data" value="false" />
-    <property name="test.integration.ems" value="false" />
-    <property name="test.integration.nms" value="false" />
+    <property name="test.integration.data" value="false" overwrite="false" />
+    <property name="test.integration.ems" value="false" overwrite="false" />
+    <property name="test.integration.nms" value="false" overwrite="false" />
     <property name="build-aop" value="true"/>
     <property name="build-data" value="true"/>
     <property name="build-services" value="true"/>
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
index b1ac0b74..122e2e4b 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
@@ -24,9 +24,9 @@
       <sources failonempty="true">
         <include name="**/*.cs" />
       </sources>
-      <resources basedir="Resources">
-        <include name="**/*" />
-      </resources>
+      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+		<include name="**/*.xml" />
+	  </resources>
       <references basedir="${current.bin.dir}">
         <include name="*.dll" />
         <include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
@@ -43,7 +43,6 @@
     </csc>
   </target>
   <target name="test" depends="build">
-    <!-- skipping running of tests for now -->
-    <!-- call target="common.run-tests" if="${test.integration.data}" / -->
+    <call target="common.run-tests" if="${test.integration.data}" />
   </target>
 </project>