diff --git a/src/etc/testcases/taskdefs/bzip2.xml b/src/etc/testcases/taskdefs/bzip2.xml
index 1e7fe8fef..e133dae0a 100644
--- a/src/etc/testcases/taskdefs/bzip2.xml
+++ b/src/etc/testcases/taskdefs/bzip2.xml
@@ -18,28 +18,27 @@
 
 <project basedir="." default="cleanup">
 
+  <import file="../buildfiletest-base.xml"/>
+
   <target name="realTest">
-    <bzip2 src="expected/asf-logo-huge.tar" zipfile="asf-logo-huge.tar.bz2" />
+    <bzip2 src="${output}/asf-logo-huge-from-gzip.tar"
+           zipfile="${output}/asf-logo-huge.tar.bz2" />
   </target>
 
   <target name="realTestWithResource">
-    <bzip2 zipfile="asf-logo-huge.tar.bz2">
-      <file file="expected/asf-logo-huge.tar"/>
+    <bzip2 zipfile="${output}/asf-logo-huge.tar.bz2">
+      <file file="${output}/asf-logo-huge-from-gzip.tar"/>
     </bzip2>
   </target>
 
   <target name="testDateCheck">
-    <touch file="asf-logo.gif.bz2"/>
-    <bzip2 src="../asf-logo.gif" zipfile="asf-logo.gif.bz2" />
-  </target>
-
-  <target name="cleanup">
-    <delete file="asf-logo-huge.tar.bz2" />
-    <delete file="asf-logo.gif.bz2" />
-    <delete file="expected/asf-logo-huge.tar"/>
+    <touch file="${output}/asf-logo.gif.bz2"/>
+    <bzip2 src="../asf-logo.gif" zipfile="${output}/asf-logo.gif.bz2" />
   </target>
 
   <target name="prepare">
-    <gunzip src="expected/asf-logo-huge.tar.gz"/>
+    <mkdir dir="${output}"/>
+    <gunzip src="expected/asf-logo-huge.tar.gz"
+            dest="${output}/asf-logo-huge-from-gzip.tar"/>
   </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
index 774fb6e80..bd881430a 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
@@ -42,17 +42,15 @@ public class BZip2Test {
     @Rule
     public BuildFileRule buildRule = new BuildFileRule();
 
+    private File outputDir;
+
     @Before
     public void setUp() {
         buildRule.configureProject("src/etc/testcases/taskdefs/bzip2.xml");
+        outputDir = new File(buildRule.getProject().getProperty("output"));
         buildRule.executeTarget("prepare");
     }
 
-    @After
-    public void tearDown() {
-        buildRule.executeTarget("cleanup");
-    }
-
     @Test
     public void testRealTest() throws IOException {
         buildRule.executeTarget("realTest");
@@ -68,7 +66,7 @@ public class BZip2Test {
 
         File originalFile =
             buildRule.getProject().resolveFile("expected/asf-logo-huge.tar.bz2");
-        File actualFile   = buildRule.getProject().resolveFile("asf-logo-huge.tar.bz2");
+        File actualFile   = new File(outputDir, "asf-logo-huge.tar.bz2");
 
         InputStream originalIn =
             new BufferedInputStream(new FileInputStream(originalFile));