diff --git a/tests/database/repodbtest.py b/tests/database/repodbtest.py
index a5d38361..7ed2c0dc 100644
--- a/tests/database/repodbtest.py
+++ b/tests/database/repodbtest.py
@@ -21,7 +21,7 @@ class RepoDBTestCase(testcase.TestCase):
 
     def testAddRemoveRepo(self):
         assert "contrib-2007-src" not in self.repodb.list_repos()
-        repo = pisi.db.repodb.Repo(pisi.uri.URI("repos/contrib-2007/pisi-index.xml.bz2"))
+        repo = pisi.db.repodb.Repo(pisi.uri.URI("repos/contrib-2007/pisi-index.xml"))
         self.repodb.add_repo("contrib-2007-src", repo)
         assert "contrib-2007-src" in self.repodb.list_repos()
         self.repodb.remove_repo("contrib-2007-src")
@@ -32,7 +32,7 @@ class RepoDBTestCase(testcase.TestCase):
     def testAddRemoveCycle(self):
         for r in range(30):
             assert "test-repo" not in self.repodb.list_repos()
-            repo = pisi.db.repodb.Repo(pisi.uri.URI("http://test-repo/pisi-index.xml.bz2"))
+            repo = pisi.db.repodb.Repo(pisi.uri.URI("http://test-repo/pisi-index.xml"))
             self.repodb.add_repo("test-repo", repo)
             assert "test-repo" in self.repodb.list_repos()
             self.repodb.remove_repo("test-repo")
@@ -51,13 +51,13 @@ class RepoDBTestCase(testcase.TestCase):
     def testGetRepo(self):
         repo = self.repodb.get_repo("pardus-2007")
         uri = repo.indexuri
-        assert uri.get_uri() == "repos/pardus-2007-bin/pisi-index.xml.bz2"
+        assert uri.get_uri() == "repos/pardus-2007-bin/pisi-index.xml"
 
     def testRepoOrder(self):
         repoorder = pisi.db.repodb.RepoOrder()
         assert repoorder.get_order() == ['pardus-2007', 'contrib-2007', 'pardus-2007-src']
 
-        repoorder.add("test-repo", "http://test-repo/pisi-index.xml.bz2")
+        repoorder.add("test-repo", "http://test-repo/pisi-index.xml")
         assert repoorder.get_order() == ['pardus-2007', 'contrib-2007', 'pardus-2007-src', 'test-repo']
 
         repoorder.remove("test-repo")
diff --git a/tests/database/testcase.py b/tests/database/testcase.py
index da19882d..cca50c0c 100644
--- a/tests/database/testcase.py
+++ b/tests/database/testcase.py
@@ -16,9 +16,9 @@ class TestCase(unittest.TestCase):
         ctx.config.values.general.distribution_release = "2007"
 
         if not pisi.api.list_repos():
-            pisi.api.add_repo("pardus-2007", "repos/pardus-2007-bin/pisi-index.xml.bz2")
-            pisi.api.add_repo("contrib-2007", "repos/contrib-2007-bin/pisi-index.xml.bz2")
-            pisi.api.add_repo("pardus-2007-src", "repos/pardus-2007/pisi-index.xml.bz2")
+            pisi.api.add_repo("pardus-2007", "repos/pardus-2007-bin/pisi-index.xml")
+            pisi.api.add_repo("contrib-2007", "repos/contrib-2007-bin/pisi-index.xml")
+            pisi.api.add_repo("pardus-2007-src", "repos/pardus-2007/pisi-index.xml")
             pisi.api.update_repo("pardus-2007")
             pisi.api.update_repo("contrib-2007")
             pisi.api.update_repo("pardus-2007-src")
diff --git a/tests/filetest.py b/tests/filetest.py
index c97f86b6..2c4abded 100644
--- a/tests/filetest.py
+++ b/tests/filetest.py
@@ -14,12 +14,12 @@ class FileTestCase(unittest.TestCase):
         self.assert_(File.make_uri(url))
 
     def testChooseMethod(self):
-        compress = File('repos/contrib-2007/pisi-index.xml.bz2', File.read)
+        compress = File('repos/contrib-2007/pisi-index.xml', File.read)
         self.assert_(File.choose_method('pisi.conf', compress))
 
     def testDecompress(self):
         localfile = File('repos/pardus-2007/system/base/curl/pspec.xml', File.read)
-        compress = File('repos/contrib-2007/pisi-index.xml.bz2', File.read)
+        compress = File('repos/contrib-2007/pisi-index.xml', File.read)
         self.assert_(File.decompress(localfile,compress))
 
     def testLocalFile(self):