diff --git a/tests/data/t.arj b/tests/data/t.arj
index 9300253..fc99a5c 100644
Binary files a/tests/data/t.arj and b/tests/data/t.arj differ
diff --git a/tests/data/t.arj.foo b/tests/data/t.arj.foo
index 9300253..fc99a5c 100644
Binary files a/tests/data/t.arj.foo and b/tests/data/t.arj.foo differ
diff --git a/tests/data/t.cab.foo b/tests/data/t.cab.foo
index f9a1bbf..a24a1fd 100644
Binary files a/tests/data/t.cab.foo and b/tests/data/t.cab.foo differ
diff --git a/tests/data/t.taz b/tests/data/t.taz
index 5cf39f0..63a0701 100644
Binary files a/tests/data/t.taz and b/tests/data/t.taz differ
diff --git a/tests/data/t.taz.foo b/tests/data/t.taz.foo
index 5cf39f0..63a0701 100644
Binary files a/tests/data/t.taz.foo and b/tests/data/t.taz.foo differ
diff --git a/tests/data/t.txt.xz.foo b/tests/data/t.txt.xz.foo
new file mode 100644
index 0000000..153cb76
Binary files /dev/null and b/tests/data/t.txt.xz.foo differ
diff --git a/tests/data/t.xz.foo b/tests/data/t.xz.foo
deleted file mode 100644
index 03545d7..0000000
Binary files a/tests/data/t.xz.foo and /dev/null differ
diff --git a/tests/test_foo_archives.py b/tests/test_foo_archives.py
index 441b3f2..a30c8d0 100644
--- a/tests/test_foo_archives.py
+++ b/tests/test_foo_archives.py
@@ -182,36 +182,36 @@ class TestArchives (ArchiveTest):
     @needs_program('bzip2')
     def test_bzip2 (self):
         self.program = 'bzip2'
-        self.archive_extract('t.bz2.foo')
-        self.archive_test('t.bz2.foo')
-        self.archive_create('t.bz2.foo', format="bzip2", singlefile=True)
+        self.archive_extract('t.txt.bz2.foo')
+        self.archive_test('t.txt.bz2.foo')
+        self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
 
     @needs_program('file')
     def test_py_bz2 (self):
         self.program = 'py_bz2'
-        self.archive_extract('t.bz2.foo')
-        self.archive_create('t.bz2.foo', format="bzip2", singlefile=True)
+        self.archive_extract('t.txt.bz2.foo')
+        self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
 
     @needs_program('file')
     @needs_program('pbzip2')
     def test_pbzip2 (self):
         self.program = 'pbzip2'
-        self.archive_extract('t.bz2.foo')
-        self.archive_test('t.bz2.foo')
-        self.archive_create('t.bz2.foo', format="bzip2", singlefile=True)
+        self.archive_extract('t.txt.bz2.foo')
+        self.archive_test('t.txt.bz2.foo')
+        self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
 
     @needs_program('file')
     @needs_program('lbzip2')
     def test_lbzip2 (self):
         self.program = 'lbzip2'
-        self.archive_extract('t.bz2.foo')
-        self.archive_test('t.bz2.foo')
-        self.archive_create('t.bz2.foo', format="bzip2", singlefile=True)
+        self.archive_extract('t.txt.bz2.foo')
+        self.archive_test('t.txt.bz2.foo')
+        self.archive_create('t.txt.bz2.foo', format="bzip2", singlefile=True)
 
     @needs_program('file')
     def test_py_echo (self):
         self.program = 'py_echo'
-        self.archive_list('t.bz2.foo')
+        self.archive_list('t.txt.bz2.foo')
         self.archive_list('t.txt.Z.foo')
         # file(1) does not recognize .lzma files
         #self.archive_list('t.lzma.foo')
diff --git a/tests/test_mime.py b/tests/test_mime.py
index 4b665ee..146536a 100644
--- a/tests/test_mime.py
+++ b/tests/test_mime.py
@@ -49,16 +49,16 @@ class TestMime (unittest.TestCase):
         self.mime_test_file("t.7z.foo", "application/x-7z-compressed", None)
         self.mime_test_file("t.arj", "application/x-arj", None)
         self.mime_test_file("t.arj.foo", "application/x-arj", None)
-        self.mime_test_file("t .bz2", "application/x-bzip2", None)
-        self.mime_test_file("t.bz2.foo", "application/x-bzip2", None)
+        self.mime_test_file("t.txt.bz2", "application/x-bzip2", None)
+        self.mime_test_file("t.txt.bz2.foo", "application/x-bzip2", None)
         self.mime_test_file("t.cab", "application/vnd.ms-cab-compressed", None)
         self.mime_test_file("t.cab.foo", "application/vnd.ms-cab-compressed", None)
         self.mime_test_file("t.cpio", "application/x-cpio", None)
         self.mime_test_file("t.cpio.foo", "application/x-cpio", None)
         self.mime_test_file("t.deb", "application/x-debian-package", None)
         self.mime_test_file("t.deb.foo", "application/x-debian-package", None)
-        self.mime_test_file("t.gz", "application/x-gzip", None)
-        self.mime_test_file("t.gz.foo", "application/x-gzip", None)
+        self.mime_test_file("t.txt.gz", "application/x-gzip", None)
+        self.mime_test_file("t.txt.gz.foo", "application/x-gzip", None)
         self.mime_test_file("t.jar", "application/zip", None)
         self.mime_test_file("t.jar.foo", "application/zip", None)
         # file(1) does not recognize .lzma files
@@ -87,10 +87,10 @@ class TestMime (unittest.TestCase):
         #self.mime_test_file("t.tar.lzma.foo", "application/x-tar", "lzma")
         self.mime_test_file("t.txt.gz", "application/x-gzip", None)
         self.mime_test_file("t.txt.gz.foo", "application/x-gzip", None)
-        self.mime_test_file("t .xz", "application/x-xz", None)
-        self.mime_test_file("t.xz.foo", "application/x-xz", None)
-        self.mime_test_file("t.Z", "application/x-compress", None)
-        self.mime_test_file("t.Z.foo", "application/x-compress", None)
+        self.mime_test_file("t.txt.xz", "application/x-xz", None)
+        self.mime_test_file("t.txt.xz.foo", "application/x-xz", None)
+        self.mime_test_file("t.txt.Z", "application/x-compress", None)
+        self.mime_test_file("t.txt.Z.foo", "application/x-compress", None)
         self.mime_test_file("t.jar", "application/zip", None)
         self.mime_test_file("t.jar.foo", "application/zip", None)
         self.mime_test_file("t.zip", "application/zip", None)