diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 5f48bff98..bb692f2db 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -25,7 +25,14 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac 
-            srcdir="./src:./test" 
+            srcdir="./src" 
+            debug="true" deprecation="on" source="1.5" target="1.5" 
+            destdir="./build/obj" 
+            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
+    </target>
+    <target name="compileTest" depends="compile">
+        <javac 
+            srcdir="./test" 
             debug="true" deprecation="on" source="1.5" target="1.5" 
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
@@ -38,6 +45,9 @@
             </manifest>
         </jar>
     </target>
+    <target name="jarTest" depends="jar, compileTest">
+        <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*Test*.class" update="true" />
+    </target>
     <target name="javadoc">
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />