diff --git a/build.xml b/build.xml
index 64157cf9d9..3f6c2aee3a 100644
--- a/build.xml
+++ b/build.xml
@@ -980,12 +980,6 @@
         </exec>
     </target>
 
-    <target name="updateTest" depends="prepupdate">
-        <ant dir="core/java/" target="jarTest" />
-        <copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
-        <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
-    </target>
-
     <!-- script translation added in 0.8.13, so don't need updates until .14, but put it in now so we don't forget -->
     <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation">
         <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
@@ -1245,6 +1239,12 @@
     </target>
     <!-- end custom installers -->
 
+    <!-- unit tests -->
+    <target name="updateTest" depends="prepupdate">
+        <ant dir="core/java/" target="jarTest" />
+        <copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
+        <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
+    </target>
     <target name="test" depends="buildProperties, jbigi" >
         <mkdir dir="reports/core/junit/" />
         <ant dir="core/java/" target="test" />
@@ -1264,6 +1264,7 @@
 		<ant dir="core/java/" target="fullclovertest" />
 		<ant dir="router/java/" target="fullclovertest" />
     </target>
+    <!-- end unit tests -->
 
     <target name="testscripts" >
         <exec executable="tests/scripts/checkcerts.sh" failonerror="true" />
diff --git a/core/java/build.xml b/core/java/build.xml
index c3eaf5c078..675ee71449 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -28,17 +28,6 @@
         </javac>
     </target>
 
-    <target name="compileTest">
-        <mkdir dir="./build" />
-        <mkdir dir="./build/obj" />
-        <!-- junit classes are in ant runtime -->
-        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
-               includeAntRuntime="true"
-               destdir="./build/obj" >
-            <compilerarg line="${javac.compilerargs}" />
-        </javac>
-    </target>
-
     <target name="listChangedFiles" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
@@ -72,14 +61,26 @@
         </uptodate>
     </target>
 
-    <target name="jarTest" depends="compileTest">
-        <jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />
-    </target>
     <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" />
     </target>
+
+    <!-- unit tests -->
+    <target name="compileTest">
+        <mkdir dir="./build" />
+        <mkdir dir="./build/obj" />
+        <!-- junit classes are in ant runtime -->
+        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
+               includeAntRuntime="true"
+               destdir="./build/obj" >
+            <compilerarg line="${javac.compilerargs}" />
+        </javac>
+    </target>
+    <target name="jarTest" depends="compileTest">
+        <jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />
+    </target>
     <target name="prepareTest" depends="compileTest" if="with.cobertura">
         <taskdef classpath="${with.cobertura}" resource="tasks.properties" onerror="report" />
         <mkdir dir="./build/obj_test" />
@@ -133,6 +134,8 @@
     </target>
     <target name="test.report" depends="junit.report"/>
     <target name="fulltest" depends="test, junit.report" />
+    <!-- end unit tests -->
+
     <target name="clean">
         <delete dir="./build" />
     </target>
diff --git a/router/java/build.xml b/router/java/build.xml
index e933086cf8..61592a8cf9 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -5,9 +5,6 @@
     <target name="builddep">
         <!-- run from top level build.xml to get dependencies built -->
     </target>
-    <target name="builddeptest">
-        <ant dir="../../core/java/" target="jarTest" />
-    </target>
     <condition property="depend.available">
         <typefound name="depend" />
     </condition>
@@ -42,17 +39,6 @@
         </javac>
     </target>
 
-    <target name="compileTest" depends="builddeptest">
-        <mkdir dir="./build" />
-        <mkdir dir="./build/obj" />
-        <!-- junit classes are in ant runtime -->
-        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
-               includeAntRuntime="true"
-               destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
-            <compilerarg line="${javac.compilerargs}" />
-        </javac>
-    </target>
-
     <target name="listChangedFiles" if="mtn.available" >
         <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
             <arg value="list" />
@@ -86,9 +72,6 @@
         </uptodate>
     </target>
 
-    <target name="jarTest" depends="compileTest">
-        <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
-    </target>
     <target name="javadoc">
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
@@ -99,6 +82,24 @@
             splitindex="true" 
             windowtitle="I2P Router" />
     </target>
+
+    <!-- unit tests -->
+    <target name="builddeptest">
+        <ant dir="../../core/java/" target="jarTest" />
+    </target>
+    <target name="compileTest" depends="builddeptest">
+        <mkdir dir="./build" />
+        <mkdir dir="./build/obj" />
+        <!-- junit classes are in ant runtime -->
+        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
+               includeAntRuntime="true"
+               destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
+            <compilerarg line="${javac.compilerargs}" />
+        </javac>
+    </target>
+    <target name="jarTest" depends="compileTest">
+        <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
+    </target>
     <target name="test" depends="compileTest">
         <junit printsummary="on" fork="yes">
             <classpath>
@@ -164,6 +165,8 @@
     </target>
     <target name="fulltest" depends="cleandep, builddeptest, jarTest, test, junit.report" />
     <target name="fullclovertest" depends="cleandep, builddeptest, useclover, jarTest, test, test.report" />
+    <!-- end unit tests -->
+
     <target name="clean">
         <delete dir="./build" />
     </target>