Index: common-build.xml
===================================================================
--- common-build.xml	(revision 931422)
+++ common-build.xml	(working copy)
@@ -414,7 +414,7 @@
 	    This is very loud and obnoxious. abuse touch instead for a "quiet" mkdir
 	    -->
     	<touch file="@{tempDir}/@{pattern}/quiet.ant" verbose="false" mkdirs="true"/>
-	    <junit printsummary="off" haltonfailure="no" maxmemory="512M"
+	    <junit printsummary="off" haltonfailure="no" maxmemory="512M" tempdir="@{tempDir}/@{pattern}"
 	      errorProperty="tests.failed" failureProperty="tests.failed" forkmode="perBatch" dir=".">
 	      <classpath refid="@{junit.classpath}"/>
 	      <assertions>
@@ -475,7 +475,7 @@
   </target>
 
   <target name="junit-parallel" unless="runsequential">
-    <parallel threadsPerProcessor="2">
+    <parallel threadsPerProcessor="1">
      <test-macro pattern="A"/>
      <test-macro pattern="B"/>
      <test-macro pattern="C"/>
Index: contrib/benchmark/build.xml
===================================================================
--- contrib/benchmark/build.xml	(revision 931422)
+++ contrib/benchmark/build.xml	(working copy)
@@ -6,6 +6,8 @@
     </description>
 
     <import file="../contrib-build.xml"/>
+    <!-- the tests have some parallel problems -->
+    <property name="runsequential" value="true"/>
     <property name="working.dir" location="work"/>
 
     <contrib-uptodate name="highlighter" property="highlighter.uptodate" classpath.property="highlighter.jar"/>