diff --git a/ipscan-unittest/build.xml b/ipscan-unittest/build.xml
index 6ab19f47..9b78e23a 100755
--- a/ipscan-unittest/build.xml
+++ b/ipscan-unittest/build.xml
@@ -4,11 +4,14 @@
 	<property name="dist" value="dist"/>
 	<property name="ext" value="ext"/>
 	<property name="src" value="src"/>
+	<property name="classes-to-test" value="../ipscan/bin"/>
 	<property name="testresults" value="testresults"/>
 			
 	<property name="swt" value="../swt"/>
 	<property name="emma.dir" value="${ext}/emma"/>
 	
+	<path id="test.path" path="bin"/>
+	
 	<path id="emma.lib">
 		<pathelement location="${emma.dir}/emma.jar" />
 		<pathelement location="${emma.dir}/emma_ant.jar" />
@@ -20,7 +23,7 @@
 		<exclude name="**/*.java"/>
 	</patternset>
 
-	<target name="test" depends="cleanup,compile-tests,do_test,cleanup_end"/>
+	<target name="test" depends="cleanup,compile-tests,do-test,cleanup_end"/>
 
 	<target name="cleanup">
 		<delete dir="bin"/>
@@ -33,18 +36,14 @@
 
 	<macrodef name="compile">
 		<attribute name="path"/>
-		<attribute name="dest" default="@{path}"/>
-		<attribute name="extpath" default=""/>
-		<attribute name="debug" default="false"/>
-		<attribute name="optimize" default="true"/>
 		<sequential>
 			<mkdir dir="bin"/>
-			<javac destdir="bin" debug="@{debug}" source="1.5" target="1.5">
+			<javac destdir="bin" source="1.5" target="1.5">
 				<src path="@{path}"/>
-				<src path="@{extpath}"/>				
 				<classpath>
 					<fileset dir="${ext}" includes="**/*.jar"/>
 					<fileset dir="${swt}" includes="*.jar"/>
+					<path path="${classes-to-test}"/>
 				</classpath>
 			</javac>
 			<copy todir="bin">
@@ -52,16 +51,11 @@
 					<patternset refid="classpath.resources"/>
 				</fileset>
 			</copy>
-			<copy todir="bin">
-				<fileset dir="${resources}">
-					<patternset refid="classpath.resources"/>
-				</fileset>
-			</copy>
 		</sequential>
 	</macrodef>
 
 	<target name="compile-tests">
-		<compile path="${src}" dest="${test}" extpath="${ext.src}" debug="true"/>
+		<compile path="${src}"/>
 		<emma>
 			<instr instrpathref="test.path" destdir="bin.instr" metadatafile="${testresults}/metadata.emma" merge="false" filter="net.azib.ipscan.*"/>
 		</emma>
@@ -69,10 +63,9 @@
 			<fileset dir="bin.instr" includes="**/*.class"/>
 		</copy>
 		<delete dir="bin.instr"/>
-		<compile path="${test}" dest="${test}" debug="true"/>
 	</target>
 
-	<target name="do_test">
+	<target name="do-test">
 		<delete dir="${testresults}"/>
 		<mkdir dir="${testresults}"/>
 		<delete file="coverage.ec"/>
diff --git a/ipscan-unittest/ext/junit/junit-4.1.jar b/ipscan-unittest/ext/junit/junit-4.1.jar
new file mode 100755
index 00000000..2c46d67a
Binary files /dev/null and b/ipscan-unittest/ext/junit/junit-4.1.jar differ