diff --git a/tests/archivetests.py b/tests/archivetests.py
index a90cd8a9..da2b0146 100644
--- a/tests/archivetests.py
+++ b/tests/archivetests.py
@@ -16,7 +16,7 @@ class ArchiveFileTestCase(unittest.TestCase):
 #     pass
 
     def testUnpackTar(self):
-        ctx = context.BuildContext("samples/popt/pspec.xml")
+        ctx = context.BuildContext("tests/popt/pspec.xml")
 
         achv = sourcearchive.SourceArchive(ctx)
     
diff --git a/tests/fetchertests.py b/tests/fetchertests.py
index 1a797b6b..11fe55f6 100644
--- a/tests/fetchertests.py
+++ b/tests/fetchertests.py
@@ -10,7 +10,7 @@ from pisi import purl
 
 class FetcherTestCase(unittest.TestCase):
     def setUp(self):
-        self.ctx = context.BuildContext("samples/popt/pspec.xml")
+        self.ctx = context.BuildContext("tests/popt/pspec.xml")
         self.url = purl.PUrl(self.ctx.spec.source.archiveUri)
         self.destpath = config.config.archives_dir()
         self.fetch = fetcher.Fetcher(self.url, self.destpath)
diff --git a/tests/packagedbtests.py b/tests/packagedbtests.py
index 7d4cbebc..2ce75e11 100644
--- a/tests/packagedbtests.py
+++ b/tests/packagedbtests.py
@@ -9,7 +9,7 @@ from pisi import context
 class PackageDBTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.ctx = context.BuildContext('samples/popt/pspec.xml')
+        self.ctx = context.BuildContext('tests/popt/pspec.xml')
         
     def testAdd(self):
         packagedb.add_package(self.ctx.spec.packages[0])
diff --git a/tests/sourcedbtests.py b/tests/sourcedbtests.py
index f35321aa..64746df1 100644
--- a/tests/sourcedbtests.py
+++ b/tests/sourcedbtests.py
@@ -9,7 +9,7 @@ from pisi import context
 class SourceDBTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.ctx = context.BuildContext("samples/popt/pspec.xml")
+        self.ctx = context.BuildContext("tests/popt/pspec.xml")
         
     def testAdd(self):
         sourcedb.add_source(self.ctx.spec.source)
diff --git a/tests/specfiletests.py b/tests/specfiletests.py
index 93e8460f..e70202f8 100644
--- a/tests/specfiletests.py
+++ b/tests/specfiletests.py
@@ -9,7 +9,7 @@ import pisi.util as util
 class SpecFileTestCase(unittest.TestCase):
     def setUp(self):
         self.spec = specfile.SpecFile()
-        self.spec.read("samples/popt/pspec.xml")
+        self.spec.read("tests/popt/pspec.xml")
     
     def testReadSpec(self):
         self.assertEqual(self.spec.source.name, "popt")
@@ -64,7 +64,7 @@ class SpecFileTestCase(unittest.TestCase):
 
     def testCopy(self):
         util.check_dir(config.tmp_dir())
-        self.spec.read("samples/popt/pspec.xml")
+        self.spec.read("tests/popt/pspec.xml")
         self.spec.write(os.path.join(config.tmp_dir(), 'popt-copy.pspec.xml'))
 
 suite = unittest.makeSuite(SpecFileTestCase)