diff --git a/build.xml b/build.xml
index 22a4ba6..bed7841 100644
--- a/build.xml
+++ b/build.xml
@@ -22,11 +22,17 @@ under the License.
   <!-- easy way to override properties -->
   <property file="build.properties"/>
 
-  <!-- don't fork junit; regexp classes not available -->
-  <property name="junit.fork" value="false" />
-
-  <property name="javac.-source" value="1.5" />
-  <property name="javac.-target" value="1.5" />
+  <!-- we don't want the build to look for a packaged AntUnit -->
+  <target name="setup-for-antunit-tests" depends="setup,determine-test-types,resolve"
+    unless="skip-antunit">
+    <typedef uri="antlib:org.apache.ant.antunit"
+      resource="org/apache/ant/antunit/antlib.xml">
+      <classpath>
+        <path refid="classpath.test"/>
+        <pathelement location="${antlib.location}"/>
+      </classpath>
+    </typedef>
+  </target>
 
   <import file="common/build.xml"/>
 </project>
diff --git a/common b/common
index a715465..2a9972e 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a715465514e3aaa5e6e06a91345c0292c3642539
+Subproject commit 2a9972ef3b45984824a23831857c95ba2a6518b6