diff --git a/pactest/tests/conflict004.py b/pactest/tests/depconflict100.py
similarity index 100%
rename from pactest/tests/conflict004.py
rename to pactest/tests/depconflict100.py
diff --git a/pactest/tests/conflict002.py b/pactest/tests/depconflict110.py
similarity index 100%
rename from pactest/tests/conflict002.py
rename to pactest/tests/depconflict110.py
diff --git a/pactest/tests/conflict003.py b/pactest/tests/depconflict111.py
similarity index 88%
rename from pactest/tests/conflict003.py
rename to pactest/tests/depconflict111.py
index 7205086a..6f95733b 100644
--- a/pactest/tests/conflict003.py
+++ b/pactest/tests/depconflict111.py
@@ -7,7 +7,7 @@
 lp = pmpkg("pkg2", "1.0-1")
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename() 
+self.args = "-A %s" % p.filename()
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")
 self.addrule("PKG_EXIST=pkg2")
diff --git a/pactest/tests/conflict001.py b/pactest/tests/depconflict120.py
similarity index 100%
rename from pactest/tests/conflict001.py
rename to pactest/tests/depconflict120.py
diff --git a/pactest/tests/conflict005.py b/pactest/tests/fileconflict001.py
similarity index 100%
rename from pactest/tests/conflict005.py
rename to pactest/tests/fileconflict001.py
diff --git a/pactest/tests/conflict006.py b/pactest/tests/fileconflict002.py
similarity index 99%
rename from pactest/tests/conflict006.py
rename to pactest/tests/fileconflict002.py
index 43899f04..da04e332 100644
--- a/pactest/tests/conflict006.py
+++ b/pactest/tests/fileconflict002.py
@@ -14,4 +14,3 @@
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
 self.addrule("!PKG_EXIST=pkg2")
-