diff --git a/build.xml b/build.xml
index 598cb8e..bb015c7 100644
--- a/build.xml
+++ b/build.xml
@@ -29,7 +29,9 @@
 	
 	<target name="create_run_jar" depends="compile">
 		<jar destfile="${jar.name}" basedir="${build.dir}">
-			<manifest file="${manifest.file}" />
+			<manifest>
+				<attribute name="Main-Class" value="com.flaremicro.crossjeeves.CrossJeevesMain"/>
+			</manifest>
 			<fileset dir="${build.dir}">
 				<include name="**/*.class" />
 			</fileset>
@@ -52,8 +54,8 @@
 				<pathelement location="bin" />
 				<fileset dir="/tool/junit4" includes="*.jar" />
 			</classpath>
-			<batchtest fork="yes" todir="reports">
-				<fileset dir="bin/test">
+			<batchtest fork="yes" todir="${reports.dir}">
+				<fileset dir="${test.dir}">
 					<include name="**/*Test.class" />
 				</fileset>
 			</batchtest>