diff --git a/build.xml b/build.xml
index 88265be882..3b3a3666f9 100644
--- a/build.xml
+++ b/build.xml
@@ -492,8 +492,8 @@
             <group title="Core SDK" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject" />
             <sourcepath>
-                <pathelement location="core/java/test" />
-                <pathelement location="router/java/test" />
+                <pathelement location="core/java/test/junit" />
+                <pathelement location="router/java/test/junit" />
             </sourcepath>
             <classpath>
                 <pathelement location="build/i2p.jar" />
diff --git a/core/java/build.xml b/core/java/build.xml
index b40f4f6676..a415e7954f 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -65,7 +65,7 @@
     <target name="javadoc">
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
-        <javadoc sourcepath="./src:./test" destdir="./build/javadoc" packagenames="*" use="true" splitindex="true" windowtitle="I2P SDK" />
+        <javadoc sourcepath="./src:./test/junit" destdir="./build/javadoc" packagenames="*" use="true" splitindex="true" windowtitle="I2P SDK" />
     </target>
 
     <!-- scala paths -->
diff --git a/router/java/build.xml b/router/java/build.xml
index 270a277ea7..83f23fa444 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -79,7 +79,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
         <javadoc 
-            sourcepath="./src:./test:../../core/java/src:../../core/java/test" destdir="./build/javadoc" 
+            sourcepath="./src:./test/junit:../../core/java/src:../../core/java/test/junit" destdir="./build/javadoc" 
             packagenames="*" 
             use="true" 
             splitindex="true"