diff --git a/test/java/build.xml b/test/java/build.xml
index 9d7fb06..68d7b98 100644
--- a/test/java/build.xml
+++ b/test/java/build.xml
@@ -16,20 +16,26 @@
     <exec executable="../../compiler/cpp/thrift">
       <arg line="--gen java ../ThriftTest.thrift" />
     </exec>
-  </target>
-
-  <target name="compile" depends="init,generate">
-    <javac srcdir="${gen}" destdir="${build}" classpath="${cpath}" />
-    <javac srcdir="${src}" destdir="${build}" classpath="${cpath}:${gen}" />
+    <exec executable="../../compiler/cpp/thrift">
+      <arg line="--gen java ../DebugProtoTest.thrift" />
+    </exec>
+    <exec executable="../../compiler/cpp/thrift">
+      <arg line="--gen java ../OptionalRequiredTest.thrift" />
+    </exec>
   </target>
 
   <target name="compileonly">
-    <javac srcdir="${gen}" destdir="${build}" classpath="${cpath}" />
-    <javac srcdir="${src}" destdir="${build}" classpath="${cpath}:${gen}" />
+    <javac debug="true" srcdir="${gen}" destdir="${build}" classpath="${cpath}" />
+    <javac debug="true" srcdir="${src}" destdir="${build}" classpath="${cpath}:${gen}" />
+  </target>
+
+  <target name="compile" depends="init,generate,compileonly">
+    <jar jarfile="thrifttest.jar" basedir="${build}"/>
   </target>
 
   <target name="test" depends="compile">
-    <jar jarfile="thrifttest.jar" basedir="${build}"/>
+    <java classname="com.facebook.thrift.test.IdentityTest" classpath="${cpath}:./thrifttest.jar"/>
+    <java classname="com.facebook.thrift.test.EqualityTest" classpath="${cpath}:./thrifttest.jar"/>
   </target>
 
   <target name="clean">