--- build.xml.sav	2009-07-15 13:24:29.000000000 -0700
+++ build.xml	2009-07-15 13:46:31.000000000 -0700
@@ -106,12 +106,12 @@
 		<mkdir dir="${build.testresources.dir}"/>
 		<mkdir dir="${build.temp.dir}/${headerdirectory}"/>
 		<copy todir="${build.temp.dir}/${headerdirectory}">
-			<fileset dir="${classes.dir}">
+			<fileset dir="${testclasses.dir}">
 				<include name="**/test/pack/${packagename}/**.*"/>
 			</fileset>
 		</copy>
 		<jar destfile="${build.testresources.dir}/${jarname}.${extension}">
-			<!-- fileset dir="${classes.dir}" >
+			<!-- fileset dir="${testclasses.dir}" >
 			<include name="**/test/pack/${packagename}/**.*"/>
 			</fileset -->
 			<fileset dir="${build.temp.dir}">
@@ -130,7 +130,7 @@
 		<mkdir dir="${build.testresources.dir}/${jarname}.${extension}"/>
 		<copy todir="${build.testresources.dir}/${jarname}.${extension}">
 			<!-- fileset dir="${build.temp.dir}"/ -->
-			<fileset dir="${classes.dir}">
+			<fileset dir="${testclasses.dir}">
 				<include name="**/test/pack/${jarname}/**.*"/>
 			</fileset>
 			<fileset dir="${testresources.dir}/${jarname}">
@@ -207,7 +207,7 @@
 			property="build.compiler"
 			value="org.eclipse.jdt.core.JDTCompilerAdapter"
 			classpath="${java.class.path}"/>
-		<javac srcdir="${test.dir}" destdir="${classes.dir}" debug="${javac.debug}"
+		<javac srcdir="${test.dir}" destdir="${testclasses.dir}" debug="${javac.debug}"
 			optimize="${javac.optimize}" nowarn="on" source="${javac.source}"
 			target="${javac.target}">
 			<classpath>
@@ -216,15 +216,15 @@
 		</javac>
 	</target>
 	
-	<target name="junit" depends="compiletest,test-resources">	
+	<target name="junit" depends="compiletest,test-resources">
 		<for list="${targetdb}" param="db">
 			<sequential>
 				<antcall target="common-build.test-resources">
 					<param name="db" value="@{db}"/>
 				</antcall>
 				<mkdir dir="${testreports.dir}/@{db}"/>
-				<mkdir dir="${classes.dir}/META-INF/services"/>
-				<copy todir="${classes.dir}">
+				<mkdir dir="${testclasses.dir}/META-INF/services"/>
+				<copy todir="${testclasses.dir}">
 					<fileset dir="${resources.dir}">
 						<include name="**/*.*"/>
 					</fileset>
@@ -246,7 +246,9 @@
 						</fileset>
 						<path refid="junit.classpath"/>
 						<!-- pathelement path="${classes.dir}"/ -->
-						<dirset dir="${classes.dir}">
+						<!-- <dirset dir="${classes.dir}"> -->
+						<pathelement path="${classes.dir}"/>
+						<dirset dir="${testclasses.dir}">
 							<exclude name="**/pack/**.*"/>
 						</dirset>
 						<!-- pathelement path="build/test.par"/ -->
@@ -258,7 +260,7 @@
 					<formatter type="plain"/>
 					<formatter type="xml"/>
 					<batchtest fork="yes" todir="${testreports.dir}/@{db}" haltonfailure="no">
-						<fileset dir="${classes.dir}">
+						<fileset dir="${testclasses.dir}">
 							<include name="**/*Test.class"/>
 						</fileset>
 					</batchtest>