diff --git a/src/tests/antunit/taskdefs/manifest-test.xml b/src/tests/antunit/taskdefs/manifest-test.xml
index 0b371a799..985a1fd4c 100644
--- a/src/tests/antunit/taskdefs/manifest-test.xml
+++ b/src/tests/antunit/taskdefs/manifest-test.xml
@@ -20,11 +20,12 @@
 
   <import file="../antunit-base.xml" />
 
-  <property name="file" location="${output}test.mf"/>
+  <property name="file" location="${output}/test.mf"/>
 
   <target name="test8IsAllowed"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=45675"
           >
+    <mkdir dir="${output}"/>
     <manifest file="${file}">
       <attribute name="attrib8" value="test attribute"/>
     </manifest>
diff --git a/src/tests/antunit/taskdefs/retry-test.xml b/src/tests/antunit/taskdefs/retry-test.xml
index e50bc2f7d..e81853b88 100644
--- a/src/tests/antunit/taskdefs/retry-test.xml
+++ b/src/tests/antunit/taskdefs/retry-test.xml
@@ -18,9 +18,13 @@
 <project name="retry-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
   <import file="../antunit-base.xml"/>
 
-  <target name="test-fail-and-retry">
+  <target name="setUp">
     <property name="i" value="3"/>
-    <property name="dest" value="${java.io.tmpdir}/dest"/>
+    <mkdir dir="${output}"/>
+    <property name="dest" value="${output}/dest"/>
+  </target>
+
+  <target name="test-fail-and-retry" depends="setUp">
     <!-- just in case this ever becomes a legit url... -->
     <property name="src" value="http://iojasodjojaosdj"/>
     <au:expectfailure expectedmessage="Task [get] failed after [${i}] attempts; giving up">
@@ -31,9 +35,7 @@
     <au:assertLogContains text="Attempt [1]: error occurred; retrying..."/>
   </target>
 
-  <target name="test-success">
-    <property name="i" value="3"/>
-    <property name="dest" value="${java.io.tmpdir}/dest"/>
+  <target name="test-success" depends="setUp">
     <retry retrycount="${i}">
       <touch file="${dest}"/>
     </retry>
diff --git a/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java b/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java
index c17ef55cb..e5812f088 100644
--- a/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java
@@ -64,6 +64,7 @@ public class DirSetTest extends AbstractFileSetTest {
 
     public void testToString() throws Exception {
         File tmp = File.createTempFile("DirSetTest", "");
+        try {
         tmp.delete();
         File a = new File(tmp, "a");
         a.mkdirs();
@@ -78,6 +79,15 @@ public class DirSetTest extends AbstractFileSetTest {
         ds.setDir(tmp);
         ds.setIncludes("b/");
         assertEquals("b;b" + File.separator + "c", ds.toString());
+        } finally {
+            new File(tmp, "a/x").delete();
+            new File(tmp, "a").delete();
+            new File(tmp, "b/c/x").delete();
+            new File(tmp, "b/c").delete();
+            new File(tmp, "b/x").delete();
+            new File(tmp, "b").delete();
+            tmp.delete();
+        }
     }
 
 }