diff --git a/build.xml b/build.xml
index cac7ac07c9..85093803a9 100644
--- a/build.xml
+++ b/build.xml
@@ -1287,19 +1287,26 @@
     <target name="test" depends="buildProperties, jbigi" >
         <ant dir="core/java/" target="test" />
     </target>
+    <target name="scalatest.report" depends="buildProperties" >
+        <ant dir="core/java/" target="scalatest.report" />
+        <ant dir="router/java/" target="scalatest.report" />
+    </target>
     <target name="junit.report" depends="buildProperties" >
         <ant dir="core/java/" target="junit.report" />
+        <ant dir="router/java/" target="junit.report" />
     </target>
     <target name="clover.report" depends="buildProperties" if="with.clover">
         <ant dir="core/java/" target="clover.report" />
+        <ant dir="router/java/" target="clover.report" />
     </target>
     <target name="cobertura.report" depends="buildProperties" if="with.cobertura">
         <ant dir="core/java/" target="cobertura.report" />
+        <ant dir="router/java/" target="cobertura.report" />
     </target>
-    <target name="test.report" depends="junit.report, clover.report, cobertura.report"/>
-    <target name="fulltest" depends="buildProperties" >
-		<ant dir="core/java/" target="fulltest" />
-		<ant dir="router/java/" target="fulltest" />
+    <target name="test.report" depends="junit.report, scalatest.report, clover.report, cobertura.report"/>
+    <target name="fulltest" depends="buildProperties, jbigi" >
+        <ant dir="core/java/" target="fulltest" />
+        <ant dir="router/java/" target="fulltest" />
     </target>
     <!-- end unit tests -->
 
diff --git a/core/java/build.xml b/core/java/build.xml
index c52df80d31..fde47ea2b0 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -230,7 +230,7 @@
         <!-- replace hostname that junit inserts into reports with fake one -->
         <replace dir="../../reports/core/junit/" token="${host.name}" value="${host.fakename}"/>
     </target>
-    <target name="test" depends="scalatest.test"/>
+    <target name="test" depends="junit.test, scalatest.test"/>
     <!-- test reports -->
     <target name="scalatest.report">
         <junitreport todir="../../reports/core/scalatest">
@@ -262,7 +262,7 @@
         <cobertura-report format="html" srcdir="./src" destdir="../../reports/core/html/cobertura" />
         <delete file="./cobertura.ser" />
     </target>
-    <target name="test.report" depends="scalatest.report, clover.report, cobertura.report"/>
+    <target name="test.report" depends="junit.report, scalatest.report, clover.report, cobertura.report"/>
     <!-- end test reports -->
     <target name="fulltest" depends="test, test.report" />
     <!-- end unit tests -->
diff --git a/router/java/build.xml b/router/java/build.xml
index db27230604..514e4edce1 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -233,7 +233,7 @@
         <!-- replace hostname that junit inserts into reports with fake one -->
         <replace dir="../../reports/router/junit/" token="${host.name}" value="${host.fakename}"/>
     </target>
-    <target name="test" depends="scalatest.test"/>
+    <target name="test" depends="junit.test"/>
     <!-- test reports -->
     <target name="scalatest.report">
         <junitreport todir="../../reports/router/scalatest">
@@ -265,7 +265,7 @@
         <cobertura-report format="html" srcdir="./src" destdir="../../reports/router/html/cobertura" />
         <delete file="./cobertura.ser" />
     </target>
-    <target name="test.report" depends="scalatest.report, clover.report, cobertura.report"/>
+    <target name="test.report" depends="junit.report, clover.report, cobertura.report"/>
     <!-- end test reports -->
     <target name="fulltest" depends="cleandep, test, test.report" />
     <!-- end unit tests -->