diff --git a/tests/conflicttests.py b/tests/conflicttests.py
new file mode 100644
index 00000000..473a44bc
--- /dev/null
+++ b/tests/conflicttests.py
@@ -0,0 +1,28 @@
+import unittest
+import pisi
+import pisi.relation
+import pisi.conflict
+
+class ConflictTestCase(unittest.TestCase):
+    def testInstalledPackageConflicts(self):
+        pisi.api.install(["ethtool"])
+        relation = pisi.relation.Relation()
+        relation.package = "ethtool"
+        relation.version = "6"
+        relation.release = "1"
+
+        confinfo = pisi.conflict.Conflict(relation)
+        assert not pisi.conflict.installed_package_conflicts(confinfo)
+
+    def testCalculateConflicts(self):
+        packagedb = pisi.db.packagedb.PackageDB()
+        packages = ["ethtool", "zlib", "ctorrent"]
+        assert pisi.conflict.calculate_conflicts(packages, packagedb)
+
+    def testPackageConflicts(self):
+        pkg = ["ethtool","zlib"]
+
+        assert pisi.conflict.package_conflicts(pkg, confs)
+
+
+