diff --git a/JodaTime/build.xml b/JodaTime/build.xml
index 5e05456..439bb58 100644
--- a/JodaTime/build.xml
+++ b/JodaTime/build.xml
@@ -289,21 +289,43 @@
   </target>
 
 
-  <target name="test.time" depends="compile.tests">
-    <echo message="Running time tests ..."/>
-    <junit printsummary="yes" haltonfailure="yes">
-      <classpath>
-        <pathelement location="${build.tests}"/>
-        <pathelement path="${java.class.path}"/>
-      </classpath>
-
-<!--      <batchtest fork="yes">
-        <fileset dir="${src.tests}">
-          <include name="**/*Test*.java"/>
-          <exclude name="**/AllTests.java"/>
-        </fileset>
-      </batchtest>-->
-    </junit>
+  <target name="test.time" depends="compile.tests,compile.zoneinfo">
+      <echo message="Running time tests ..."/>
+      <junit printsummary="yes" haltonfailure="no">
+          <formatter type="plain" usefile="true" />
+          <classpath>
+              <pathelement location="${build.classes}"/>
+              <pathelement location="${build.tests}"/>
+              <pathelement location="${build.tz}"/>
+              <pathelement path="${java.class.path}"/>
+              <path refid="emma.lib"/>
+          </classpath>
+          
+          <batchtest fork="yes">
+              <fileset dir="${test.home}">
+                  <include name="**/Test*.java"/>
+                  <include name="**/TestAll.java"/>
+              </fileset>
+          </batchtest>
+      </junit>
   </target>
 
+  <property environment="env" />
+  <property name="emma.dir" value="${env.EMMA_HOME}" />
+  <path id="emma.lib" >
+      <pathelement location="${emma.dir}/emma.jar" />
+      <pathelement location="${emma.dir}/emma_ant.jar" />
+  </path>
+  
+  <target name="emma" description="Instruments compiled classes" depends="compile,compile.tests">
+      <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+      <emma>
+          <instr mode="overwrite">
+              <instrpath>
+                  <pathelement location="${build.classes}"/>
+                  <pathelement location="${build.tests}"/>
+              </instrpath>
+          </instr>
+      </emma>
+  </target>
 </project>
