diff --git a/build/build.xml b/build/build.xml
index e36e24f41..fbc622222 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -109,6 +109,7 @@
                 </fileset>
                 <fileset dir="${basedir}/build">
                     <include name="junit.jar"/>
+                    <include name="xmlunit.jar"/>
                 </fileset>
                 <pathelement location="${compile.dir}" />
             </classpath>
@@ -125,7 +126,7 @@
          >
              <zipfileset src="${merge.lib.dir}/xpp.jar"/>
         </jar>
-        <copy todir="${compile.dir}/META-INF" file="${basedir}/resources/META-INF/smack.providers" />
+        <copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack.providers" />
         <jar destfile="${jar.dest.dir}/smackx.jar"
             basedir="${compile.dir}"
             includes="org/jivesoftware/smackx/**/*.class, **/*.providers"
@@ -176,6 +177,14 @@
     <!-- ======================================================================================= -->
     <target name="test" depends="compile, jar-test" unless="no.test">
 
+        <echo>
+
+
+            **** no.test: ${no.test}
+
+
+        </echo>
+
         <property name="test.messenger" value="false" />
 
         <if>
@@ -202,6 +211,9 @@
                 <fileset dir="${build.lib.dir}">
                     <include name="*.jar"/>
                 </fileset>
+                <fileset dir="${basedir}/build">
+                    <include name="xmlunit.jar"/>
+                </fileset>
                 <fileset dir="${merge.lib.dir}">
                     <include name="*.jar"/>
                 </fileset>
@@ -236,7 +248,7 @@
 
     <!-- release -->
     <!-- ======================================================================================= -->
-    <target name="release" if="release.exists" depends="release-exists, test">
+    <target name="release" if="release.exists" depends="release-exists">
         <antcall target="jar">
             <param name="no.test" value="true" />
         </antcall>
diff --git a/build/release.xml b/build/release.xml
index fb4c60749..ba6795e9c 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -76,12 +76,12 @@
             <fileset dir="${basedir}/test" includes="**/*.java" />
         </copy>
         <!-- Copy resources -->
-        <copy todir="${release.dir}/resources">
-            <fileset dir="${basedir}/resources" includes="META-INF/smack.providers" />
+        <copy todir="${release.dir}/build/resources">
+            <fileset dir="${basedir}/build/resources" includes="META-INF/smack.providers" />
         </copy>
         <!-- Copy readme.html and changelog.html -->
         <copy todir="${release.dir}">
-            <fileset dir="${basedir}/resources/releasedocs" includes="*.html" />
+            <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
         </copy>
         <!-- Package -->
         <zip destfile="${basedir}/release/${release.name}.zip"