diff --git a/build.properties b/build.properties
index 17544bf6bf..896de35438 100644
--- a/build.properties
+++ b/build.properties
@@ -18,7 +18,7 @@ wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
 i2pdocs.url=http://docs.i2p-projekt.de/javadoc/
 junitdocs.url=http://junit.org/apidocs/
 # This will go in the jar manifests
-build.built-by=unknown  
+build.built-by=unknown
 
 # filename of the sloccount report
 sloccount.report.file=sloccount.sc
@@ -56,8 +56,7 @@ require.gettext=true
 
 # Location of the junit libraries
 # Defaults to the ant library path if not set.
-# If set, this must point to a directory that contains the files
-#        junit.jar and junit4.jar
+# If set, this must point to a directory that contains the file junit4.jar
 #junit.home=
 
 # Location of the hamcrest libraries
diff --git a/core/java/build.xml b/core/java/build.xml
index a6c97e1f99..903052e2fb 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -109,7 +109,6 @@
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
-                <pathelement location="${junit.home}/junit.jar" />
                 <pathelement location="${junit.home}/junit4.jar" />
             </classpath>
             <compilerarg line="${javac.compilerargs}" />
@@ -216,7 +215,6 @@
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
-                <pathelement location="${junit.home}/junit.jar" />
                 <pathelement location="${junit.home}/junit4.jar" />
                 <pathelement location="./build/obj_cobertura" />
                 <pathelement location="./build/obj" />
diff --git a/router/java/build.xml b/router/java/build.xml
index f17532b5ff..684627fd5d 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -133,7 +133,6 @@
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
-                <pathelement location="${junit.home}/junit.jar" />
                 <pathelement location="${junit.home}/junit4.jar" />
                 <pathelement location="../../core/java/build/i2ptest.jar" />
             </classpath>
@@ -226,7 +225,6 @@
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
-                <pathelement location="${junit.home}/junit.jar" />
                 <pathelement location="${junit.home}/junit4.jar" />
                 <pathelement location="./build/obj_cobertura" />
                 <pathelement location="./build/obj" />
@@ -236,7 +234,7 @@
                 <pathelement location="${with.cobertura}" />
             </classpath>
             <batchtest todir="../../reports/router/junit/">
-                <fileset dir="./test/">
+                <fileset dir="./test/junit">
                     <include name="**/*Test.java" />
                 </fileset>
             </batchtest>