diff --git a/build/build.xml b/build/build.xml
index 2300ec1e4..cb12e905b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -249,6 +249,15 @@
         />
     </target>
 
+    <target name="jar-test-smackx" depends="compile-test" description="Produces jar of test code">
+        <jar destfile="${jar.dest.dir}/smack-test-smackx.jar"
+            basedir="${compile.test.dir}"
+            includes="org/jivesoftware/smackx/**/*.class 
+		      org/jivesoftware/util/**/*.class"
+        />
+    </target>
+
+
     <!-- javadoc -->
     <!-- ======================================================================================= -->
     <target name="javadoc" description="JavaDocs the Smack source code">
@@ -354,7 +363,7 @@
 
     <!-- test-unit -->
     <!-- ======================================================================================= -->
-    <target name="test-unit" depends="compile, jar-test" unless="no.test">
+    <target name="test-unit" depends="compile, jar-test, jar-test-smackx" unless="no.test">
         <junit printsummary="on"
             fork="true"
             haltonfailure="false"
@@ -376,6 +385,7 @@
                 </fileset>
                 <fileset dir="${jar.dest.dir}">
                     <include name="smack-test.jar"/>
+		    <include name="smack-test-smackx.jar" />
                 </fileset>
                 <pathelement location="${compile.dir}" />
                 <pathelement location="${test-unit.dir}" />
@@ -453,6 +463,7 @@
         <delete file="${basedir}/smackx.jar" />
         <delete file="${basedir}/smackx-debug.jar" />
         <delete file="${basedir}/smack-test.jar" />
+        <delete file="${basedir}/smackx-test.jar" />
         <delete file="${basedir}/smackx-jingle.jar" />
         <delete dir="${basedir}/target" />
     </target>