diff -up ./build.xml.junit ./build.xml
--- ./build.xml.junit	2012-03-07 12:01:58.716741284 +0100
+++ ./build.xml	2012-03-07 12:03:39.669022092 +0100
@@ -188,9 +188,6 @@
   <target name="-setup" depends="-dynamic-properties">
     <path id="compile-test.path">
       <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
         <pathelement path="${classes}"/>
       </path>
     </path>
@@ -253,7 +250,6 @@
     <subant target="jar">
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
       <fileset dir="${contrib}" includes="platform/build.xml" />
     </subant>
   </target>
@@ -262,7 +258,6 @@
     <subant target="jar">
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
       <fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
     </subant>
   </target>
@@ -491,13 +486,12 @@
     <mkdir dir="${build}/jws"/>
     <copy todir="${build}/jws" file="${build}/${jar}"/>
     <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
     <copy todir="${build}/jws" file="lib/clover.jar"/>
     <jar jarfile="${build}/jws/jnidispatch.jar">
       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
     </jar>
     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
+      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,jnidispatch.jar,clover.jar"/>
     </signjar>
   </target>
 	
@@ -587,7 +581,6 @@
     <subant target="test">
       <property name="file.reference.jna.build" location="${build}"/>
       <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
       <fileset dir="${contrib}" includes="platform/build.xml"/>
     </subant>
   </target>
@@ -813,7 +806,7 @@ osname=macos,
     <!-- Full sources required to build and test everything -->
     <zip zipfile="${dist}/src-full.zip">
       <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
+      <zipfileset dir="lib" includes="clover.jar" prefix="lib"/>
       <zipfileset dir="." includes=".classpath,.project"/>
       <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
     </zip>