--- build.xml	2008-02-24 20:10:00.000000000 +1300
+++ build.xml	2008-02-24 20:17:10.000000000 +1300
@@ -397,16 +397,6 @@
             <classpath refid="project.class.path"/>
         </javac>
 
-        <!-- compile everything under src/test -->
-        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
-               deprecation="on"
-               debug="on"
-               optimize="on"
-               source="${javac.target.version}"
-               target="${javac.target.version}">
-            <classpath refid="test.class.path"/>
-        </javac>
-
         <!-- copy resource files to build directory -->
         <copy todir="${build.classes}" > 
             <fileset dir="${src.dir}/java" > 
@@ -430,6 +420,24 @@
             <class name="org.tanukisoftware.wrapper.WrapperManager"/>
         </javah>
     </target>
+
+    <target name="compile-test" depends="compile-java-warn">
+        <!-- compile everything under src/test -->
+        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
+                deprecation="on"
+                debug="on"
+                optimize="on"
+                source="${javac.target.version}"
+                target="${javac.target.version}">
+	        <classpath refid="test.class.path"/>
+	        <classpath>
+                <fileset dir="lib">
+		            <include name="**/*.jar"/>
+			    </fileset>
+            </classpath>
+        </javac>
+    </target>
+
     <target name="msvc-missing" depends="init:msg" if="msvc.missing">
         <condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
             <equals arg1="${bits}" arg2="64"/>
@@ -636,7 +644,7 @@
     <!-- =================================================================== -->
     <!-- Test Task                                                           -->
     <!-- =================================================================== -->
-    <target name="test" depends="jar" description="Runs unit tests">
+    <target name="test" depends="compile-test,jar" description="Runs unit tests">
         <mkdir dir="${build.tests}"/>
         
         <junit fork="true"