Index: common-build.xml
===================================================================
--- common-build.xml	(revision 986992)
+++ common-build.xml	(working copy)
@@ -283,6 +283,10 @@
     <jarify/>
   </target>
 
+ <target name="jar-core-test" depends="compile-test">
+    <jarify basedir="${build.dir}/classes/test" destfile="${build.dir}/${final.name}-tests.jar"/>
+  </target>
+
   <target name="maven.ant.tasks-check">
 	<fail unless="maven.ant.tasks.present">
 	  ##################################################################
Index: build.xml
===================================================================
--- build.xml	(revision 986992)
+++ build.xml	(working copy)
@@ -57,7 +57,7 @@
               excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/benchmark/temp/,contrib/benchmark/work/"
   />
   <patternset id="binary.build.dist.patterns"
-              includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+              includes="${final.name}*.jar,${demo.war.name}.war,${demo.name}*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
   />
   <patternset id="binary.root.dist.patterns"
               includes="src/demo/,src/jsp/,docs/,*.txt,contrib/*/README*,**/CHANGES.txt,lib/servlet-api-*.jar"
@@ -357,7 +357,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist, changes-to-html">
+  <target name="package" depends="jar-core, jar-core-test, javadocs, war-demo, build-contrib, init-dist, changes-to-html">
      <copy file="${build.demo.template}" tofile="${build.dir}/build-demo.xml">
         <filterset begintoken="@PLACEHOLDER_" endtoken="@"> 
 	  <filter token="version" value="${version}"/>
@@ -505,6 +505,8 @@
                   classifier="sources"/>
           <attach file="${build.dir}/${final.name}-javadoc.jar"
                   classifier="javadoc"/>
+          <attach file="${build.dir}/${final.name}-tests.jar"
+                  classifier="tests"/>
         </artifact-attachments>
       </m2-deploy>