Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 3578)
+++ /trunk/build.xml	(revision 3579)
@@ -143,4 +143,5 @@
 			<include name="**/*.jar"/>
 		</fileset>
+		<pathelement path="dist/josm-custom.jar"/>
 	</path>
 
@@ -155,11 +156,11 @@
 	</target>
 
-	<target name="test-compile" depends="test-init">
-		<javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
+	<target name="test-compile" depends="test-init,dist">
+		<javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
 				target="1.5" source="1.5" debug="on" encoding="UTF-8">
 			<compilerarg value="-Xlint:deprecation"/>
 			<compilerarg value="-Xlint:unchecked"/>
 		</javac>
-		<javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
+		<javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
 						target="1.5" source="1.5" debug="on" encoding="UTF-8">
 			<compilerarg value="-Xlint:deprecation"/>
@@ -195,5 +196,5 @@
 	 	-dontoptimize
 	 	-dontobfuscate
-	 	
+
 	 	-dontskipnonpubliclibraryclasses