diff --git a/Makefile.am b/Makefile.am
index 2f5e7a7b..eb80a5f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib
+SUBDIRS = lib/libalpm src/util src/pacman scripts etc po test/pacman contrib
 if WANT_DOC
 SUBDIRS += doc
 endif
@@ -15,12 +15,12 @@ pkgdatadir = ${datadir}/${PACKAGE}
 dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto
 
 # run the pactest test suite and vercmp tests
-check-local: pactest src/pacman src/util
-	$(PYTHON) $(top_srcdir)/pactest/pactest.py --debug=1 \
-		--test $(top_srcdir)/pactest/tests/*.py \
+check-local: test/pacman src/pacman src/util
+	$(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \
+		--test $(top_srcdir)/test/pacman/tests/*.py \
 		-p $(top_builddir)/src/pacman/pacman
 	rm -rf $(top_builddir)/root
-	$(SH) $(top_srcdir)/pactest/vercmptest.sh \
+	$(SH) $(top_srcdir)/test/pacman/vercmptest.sh \
 		$(top_builddir)/src/util/vercmp
 
 # create the pacman DB and cache directories upon install
diff --git a/autoclean.sh b/autoclean.sh
index 73675f8d..621bd8ae 100755
--- a/autoclean.sh
+++ b/autoclean.sh
@@ -18,11 +18,11 @@ rm -f scripts/{Makefile.in,Makefile}
 rm -f etc/{Makefile.in,Makefile}
 rm -f etc/pacman.d/{Makefile.in,Makefile}
 rm -f etc/abs/{Makefile.in,Makefile}
-rm -f pactest{,/tests}/{Makefile.in,Makefile}
+rm -f test/pacman{,/tests}/{Makefile.in,Makefile}
 rm -f contrib/{Makefile.in,Makefile}
 rm -f doc/{Makefile.in,Makefile}
 
-rm -f pactest/*.pyc
+rm -f test/pacman/*.pyc
 rm -f doc/html/*.html
 rm -f doc/man3/*.3
 
diff --git a/configure.ac b/configure.ac
index 008fa75d..3e11f8c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,8 +354,8 @@ scripts/Makefile
 doc/Makefile
 etc/Makefile
 po/Makefile.in
-pactest/Makefile
-pactest/tests/Makefile
+test/pacman/Makefile
+test/pacman/tests/Makefile
 contrib/Makefile
 Makefile
 ])
diff --git a/pactest/.gitignore b/test/pacman/.gitignore
similarity index 100%
rename from pactest/.gitignore
rename to test/pacman/.gitignore
diff --git a/pactest/ChangeLog b/test/pacman/ChangeLog
similarity index 100%
rename from pactest/ChangeLog
rename to test/pacman/ChangeLog
diff --git a/pactest/Makefile.am b/test/pacman/Makefile.am
similarity index 100%
rename from pactest/Makefile.am
rename to test/pacman/Makefile.am
diff --git a/pactest/README b/test/pacman/README
similarity index 100%
rename from pactest/README
rename to test/pacman/README
diff --git a/pactest/TODO b/test/pacman/TODO
similarity index 100%
rename from pactest/TODO
rename to test/pacman/TODO
diff --git a/pactest/pactest.py b/test/pacman/pactest.py
similarity index 100%
rename from pactest/pactest.py
rename to test/pacman/pactest.py
diff --git a/pactest/pmdb.py b/test/pacman/pmdb.py
similarity index 100%
rename from pactest/pmdb.py
rename to test/pacman/pmdb.py
diff --git a/pactest/pmenv.py b/test/pacman/pmenv.py
similarity index 100%
rename from pactest/pmenv.py
rename to test/pacman/pmenv.py
diff --git a/pactest/pmfile.py b/test/pacman/pmfile.py
similarity index 100%
rename from pactest/pmfile.py
rename to test/pacman/pmfile.py
diff --git a/pactest/pmpkg.py b/test/pacman/pmpkg.py
similarity index 100%
rename from pactest/pmpkg.py
rename to test/pacman/pmpkg.py
diff --git a/pactest/pmrule.py b/test/pacman/pmrule.py
similarity index 100%
rename from pactest/pmrule.py
rename to test/pacman/pmrule.py
diff --git a/pactest/pmtest.py b/test/pacman/pmtest.py
similarity index 100%
rename from pactest/pmtest.py
rename to test/pacman/pmtest.py
diff --git a/pactest/tests/.gitignore b/test/pacman/tests/.gitignore
similarity index 100%
rename from pactest/tests/.gitignore
rename to test/pacman/tests/.gitignore
diff --git a/pactest/tests/Makefile.am b/test/pacman/tests/Makefile.am
similarity index 100%
rename from pactest/tests/Makefile.am
rename to test/pacman/tests/Makefile.am
diff --git a/pactest/tests/config001.py b/test/pacman/tests/config001.py
similarity index 100%
rename from pactest/tests/config001.py
rename to test/pacman/tests/config001.py
diff --git a/pactest/tests/config002.py b/test/pacman/tests/config002.py
similarity index 100%
rename from pactest/tests/config002.py
rename to test/pacman/tests/config002.py
diff --git a/pactest/tests/database001.py b/test/pacman/tests/database001.py
similarity index 100%
rename from pactest/tests/database001.py
rename to test/pacman/tests/database001.py
diff --git a/pactest/tests/database002.py b/test/pacman/tests/database002.py
similarity index 100%
rename from pactest/tests/database002.py
rename to test/pacman/tests/database002.py
diff --git a/pactest/tests/database010.py b/test/pacman/tests/database010.py
similarity index 100%
rename from pactest/tests/database010.py
rename to test/pacman/tests/database010.py
diff --git a/pactest/tests/database011.py b/test/pacman/tests/database011.py
similarity index 100%
rename from pactest/tests/database011.py
rename to test/pacman/tests/database011.py
diff --git a/pactest/tests/database012.py b/test/pacman/tests/database012.py
similarity index 100%
rename from pactest/tests/database012.py
rename to test/pacman/tests/database012.py
diff --git a/pactest/tests/depconflict100.py b/test/pacman/tests/depconflict100.py
similarity index 100%
rename from pactest/tests/depconflict100.py
rename to test/pacman/tests/depconflict100.py
diff --git a/pactest/tests/depconflict110.py b/test/pacman/tests/depconflict110.py
similarity index 100%
rename from pactest/tests/depconflict110.py
rename to test/pacman/tests/depconflict110.py
diff --git a/pactest/tests/depconflict111.py b/test/pacman/tests/depconflict111.py
similarity index 100%
rename from pactest/tests/depconflict111.py
rename to test/pacman/tests/depconflict111.py
diff --git a/pactest/tests/depconflict120.py b/test/pacman/tests/depconflict120.py
similarity index 100%
rename from pactest/tests/depconflict120.py
rename to test/pacman/tests/depconflict120.py
diff --git a/pactest/tests/deptest001.py b/test/pacman/tests/deptest001.py
similarity index 100%
rename from pactest/tests/deptest001.py
rename to test/pacman/tests/deptest001.py
diff --git a/pactest/tests/dummy001.py b/test/pacman/tests/dummy001.py
similarity index 100%
rename from pactest/tests/dummy001.py
rename to test/pacman/tests/dummy001.py
diff --git a/pactest/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py
similarity index 100%
rename from pactest/tests/fileconflict001.py
rename to test/pacman/tests/fileconflict001.py
diff --git a/pactest/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py
similarity index 100%
rename from pactest/tests/fileconflict002.py
rename to test/pacman/tests/fileconflict002.py
diff --git a/pactest/tests/fileconflict003.py b/test/pacman/tests/fileconflict003.py
similarity index 100%
rename from pactest/tests/fileconflict003.py
rename to test/pacman/tests/fileconflict003.py
diff --git a/pactest/tests/fileconflict004.py b/test/pacman/tests/fileconflict004.py
similarity index 100%
rename from pactest/tests/fileconflict004.py
rename to test/pacman/tests/fileconflict004.py
diff --git a/pactest/tests/fileconflict005.py b/test/pacman/tests/fileconflict005.py
similarity index 100%
rename from pactest/tests/fileconflict005.py
rename to test/pacman/tests/fileconflict005.py
diff --git a/pactest/tests/fileconflict006.py b/test/pacman/tests/fileconflict006.py
similarity index 100%
rename from pactest/tests/fileconflict006.py
rename to test/pacman/tests/fileconflict006.py
diff --git a/pactest/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py
similarity index 100%
rename from pactest/tests/fileconflict007.py
rename to test/pacman/tests/fileconflict007.py
diff --git a/pactest/tests/ignore001.py b/test/pacman/tests/ignore001.py
similarity index 100%
rename from pactest/tests/ignore001.py
rename to test/pacman/tests/ignore001.py
diff --git a/pactest/tests/ignore002.py b/test/pacman/tests/ignore002.py
similarity index 100%
rename from pactest/tests/ignore002.py
rename to test/pacman/tests/ignore002.py
diff --git a/pactest/tests/ignore003.py b/test/pacman/tests/ignore003.py
similarity index 100%
rename from pactest/tests/ignore003.py
rename to test/pacman/tests/ignore003.py
diff --git a/pactest/tests/ignore004.py b/test/pacman/tests/ignore004.py
similarity index 100%
rename from pactest/tests/ignore004.py
rename to test/pacman/tests/ignore004.py
diff --git a/pactest/tests/ignore005.py b/test/pacman/tests/ignore005.py
similarity index 100%
rename from pactest/tests/ignore005.py
rename to test/pacman/tests/ignore005.py
diff --git a/pactest/tests/ldconfig001.py b/test/pacman/tests/ldconfig001.py
similarity index 100%
rename from pactest/tests/ldconfig001.py
rename to test/pacman/tests/ldconfig001.py
diff --git a/pactest/tests/ldconfig002.py b/test/pacman/tests/ldconfig002.py
similarity index 100%
rename from pactest/tests/ldconfig002.py
rename to test/pacman/tests/ldconfig002.py
diff --git a/pactest/tests/ldconfig003.py b/test/pacman/tests/ldconfig003.py
similarity index 100%
rename from pactest/tests/ldconfig003.py
rename to test/pacman/tests/ldconfig003.py
diff --git a/pactest/tests/mode001.py b/test/pacman/tests/mode001.py
similarity index 100%
rename from pactest/tests/mode001.py
rename to test/pacman/tests/mode001.py
diff --git a/pactest/tests/mode002.py b/test/pacman/tests/mode002.py
similarity index 100%
rename from pactest/tests/mode002.py
rename to test/pacman/tests/mode002.py
diff --git a/pactest/tests/mode003.py b/test/pacman/tests/mode003.py
similarity index 100%
rename from pactest/tests/mode003.py
rename to test/pacman/tests/mode003.py
diff --git a/pactest/tests/pacman001.py b/test/pacman/tests/pacman001.py
similarity index 100%
rename from pactest/tests/pacman001.py
rename to test/pacman/tests/pacman001.py
diff --git a/pactest/tests/pacman002.py b/test/pacman/tests/pacman002.py
similarity index 100%
rename from pactest/tests/pacman002.py
rename to test/pacman/tests/pacman002.py
diff --git a/pactest/tests/pacman003.py b/test/pacman/tests/pacman003.py
similarity index 100%
rename from pactest/tests/pacman003.py
rename to test/pacman/tests/pacman003.py
diff --git a/pactest/tests/pacman004.py b/test/pacman/tests/pacman004.py
similarity index 100%
rename from pactest/tests/pacman004.py
rename to test/pacman/tests/pacman004.py
diff --git a/pactest/tests/provision001.py b/test/pacman/tests/provision001.py
similarity index 100%
rename from pactest/tests/provision001.py
rename to test/pacman/tests/provision001.py
diff --git a/pactest/tests/provision010.py b/test/pacman/tests/provision010.py
similarity index 100%
rename from pactest/tests/provision010.py
rename to test/pacman/tests/provision010.py
diff --git a/pactest/tests/provision011.py b/test/pacman/tests/provision011.py
similarity index 100%
rename from pactest/tests/provision011.py
rename to test/pacman/tests/provision011.py
diff --git a/pactest/tests/provision012.py b/test/pacman/tests/provision012.py
similarity index 100%
rename from pactest/tests/provision012.py
rename to test/pacman/tests/provision012.py
diff --git a/pactest/tests/provision020.py b/test/pacman/tests/provision020.py
similarity index 100%
rename from pactest/tests/provision020.py
rename to test/pacman/tests/provision020.py
diff --git a/pactest/tests/provision021.py b/test/pacman/tests/provision021.py
similarity index 100%
rename from pactest/tests/provision021.py
rename to test/pacman/tests/provision021.py
diff --git a/pactest/tests/provision022.py b/test/pacman/tests/provision022.py
similarity index 100%
rename from pactest/tests/provision022.py
rename to test/pacman/tests/provision022.py
diff --git a/pactest/tests/query001.py b/test/pacman/tests/query001.py
similarity index 100%
rename from pactest/tests/query001.py
rename to test/pacman/tests/query001.py
diff --git a/pactest/tests/query002.py b/test/pacman/tests/query002.py
similarity index 100%
rename from pactest/tests/query002.py
rename to test/pacman/tests/query002.py
diff --git a/pactest/tests/query003.py b/test/pacman/tests/query003.py
similarity index 100%
rename from pactest/tests/query003.py
rename to test/pacman/tests/query003.py
diff --git a/pactest/tests/query004.py b/test/pacman/tests/query004.py
similarity index 100%
rename from pactest/tests/query004.py
rename to test/pacman/tests/query004.py
diff --git a/pactest/tests/query005.py b/test/pacman/tests/query005.py
similarity index 100%
rename from pactest/tests/query005.py
rename to test/pacman/tests/query005.py
diff --git a/pactest/tests/reason001.py b/test/pacman/tests/reason001.py
similarity index 100%
rename from pactest/tests/reason001.py
rename to test/pacman/tests/reason001.py
diff --git a/pactest/tests/remove001.py b/test/pacman/tests/remove001.py
similarity index 100%
rename from pactest/tests/remove001.py
rename to test/pacman/tests/remove001.py
diff --git a/pactest/tests/remove010.py b/test/pacman/tests/remove010.py
similarity index 100%
rename from pactest/tests/remove010.py
rename to test/pacman/tests/remove010.py
diff --git a/pactest/tests/remove011.py b/test/pacman/tests/remove011.py
similarity index 100%
rename from pactest/tests/remove011.py
rename to test/pacman/tests/remove011.py
diff --git a/pactest/tests/remove020.py b/test/pacman/tests/remove020.py
similarity index 100%
rename from pactest/tests/remove020.py
rename to test/pacman/tests/remove020.py
diff --git a/pactest/tests/remove021.py b/test/pacman/tests/remove021.py
similarity index 100%
rename from pactest/tests/remove021.py
rename to test/pacman/tests/remove021.py
diff --git a/pactest/tests/remove030.py b/test/pacman/tests/remove030.py
similarity index 100%
rename from pactest/tests/remove030.py
rename to test/pacman/tests/remove030.py
diff --git a/pactest/tests/remove040.py b/test/pacman/tests/remove040.py
similarity index 100%
rename from pactest/tests/remove040.py
rename to test/pacman/tests/remove040.py
diff --git a/pactest/tests/remove041.py b/test/pacman/tests/remove041.py
similarity index 100%
rename from pactest/tests/remove041.py
rename to test/pacman/tests/remove041.py
diff --git a/pactest/tests/remove042.py b/test/pacman/tests/remove042.py
similarity index 100%
rename from pactest/tests/remove042.py
rename to test/pacman/tests/remove042.py
diff --git a/pactest/tests/remove043.py b/test/pacman/tests/remove043.py
similarity index 100%
rename from pactest/tests/remove043.py
rename to test/pacman/tests/remove043.py
diff --git a/pactest/tests/remove044.py b/test/pacman/tests/remove044.py
similarity index 100%
rename from pactest/tests/remove044.py
rename to test/pacman/tests/remove044.py
diff --git a/pactest/tests/remove045.py b/test/pacman/tests/remove045.py
similarity index 100%
rename from pactest/tests/remove045.py
rename to test/pacman/tests/remove045.py
diff --git a/pactest/tests/remove047.py b/test/pacman/tests/remove047.py
similarity index 100%
rename from pactest/tests/remove047.py
rename to test/pacman/tests/remove047.py
diff --git a/pactest/tests/remove049.py b/test/pacman/tests/remove049.py
similarity index 100%
rename from pactest/tests/remove049.py
rename to test/pacman/tests/remove049.py
diff --git a/pactest/tests/remove050.py b/test/pacman/tests/remove050.py
similarity index 100%
rename from pactest/tests/remove050.py
rename to test/pacman/tests/remove050.py
diff --git a/pactest/tests/remove051.py b/test/pacman/tests/remove051.py
similarity index 100%
rename from pactest/tests/remove051.py
rename to test/pacman/tests/remove051.py
diff --git a/pactest/tests/remove052.py b/test/pacman/tests/remove052.py
similarity index 100%
rename from pactest/tests/remove052.py
rename to test/pacman/tests/remove052.py
diff --git a/pactest/tests/remove060.py b/test/pacman/tests/remove060.py
similarity index 100%
rename from pactest/tests/remove060.py
rename to test/pacman/tests/remove060.py
diff --git a/pactest/tests/scriptlet001.py b/test/pacman/tests/scriptlet001.py
similarity index 100%
rename from pactest/tests/scriptlet001.py
rename to test/pacman/tests/scriptlet001.py
diff --git a/pactest/tests/scriptlet002.py b/test/pacman/tests/scriptlet002.py
similarity index 100%
rename from pactest/tests/scriptlet002.py
rename to test/pacman/tests/scriptlet002.py
diff --git a/pactest/tests/smoke001.py b/test/pacman/tests/smoke001.py
similarity index 100%
rename from pactest/tests/smoke001.py
rename to test/pacman/tests/smoke001.py
diff --git a/pactest/tests/symlink001.py b/test/pacman/tests/symlink001.py
similarity index 100%
rename from pactest/tests/symlink001.py
rename to test/pacman/tests/symlink001.py
diff --git a/pactest/tests/sync001.py b/test/pacman/tests/sync001.py
similarity index 100%
rename from pactest/tests/sync001.py
rename to test/pacman/tests/sync001.py
diff --git a/pactest/tests/sync002.py b/test/pacman/tests/sync002.py
similarity index 100%
rename from pactest/tests/sync002.py
rename to test/pacman/tests/sync002.py
diff --git a/pactest/tests/sync003.py b/test/pacman/tests/sync003.py
similarity index 100%
rename from pactest/tests/sync003.py
rename to test/pacman/tests/sync003.py
diff --git a/pactest/tests/sync009.py b/test/pacman/tests/sync009.py
similarity index 100%
rename from pactest/tests/sync009.py
rename to test/pacman/tests/sync009.py
diff --git a/pactest/tests/sync010.py b/test/pacman/tests/sync010.py
similarity index 100%
rename from pactest/tests/sync010.py
rename to test/pacman/tests/sync010.py
diff --git a/pactest/tests/sync011.py b/test/pacman/tests/sync011.py
similarity index 100%
rename from pactest/tests/sync011.py
rename to test/pacman/tests/sync011.py
diff --git a/pactest/tests/sync012.py b/test/pacman/tests/sync012.py
similarity index 100%
rename from pactest/tests/sync012.py
rename to test/pacman/tests/sync012.py
diff --git a/pactest/tests/sync020.py b/test/pacman/tests/sync020.py
similarity index 100%
rename from pactest/tests/sync020.py
rename to test/pacman/tests/sync020.py
diff --git a/pactest/tests/sync021.py b/test/pacman/tests/sync021.py
similarity index 100%
rename from pactest/tests/sync021.py
rename to test/pacman/tests/sync021.py
diff --git a/pactest/tests/sync030.py b/test/pacman/tests/sync030.py
similarity index 100%
rename from pactest/tests/sync030.py
rename to test/pacman/tests/sync030.py
diff --git a/pactest/tests/sync031.py b/test/pacman/tests/sync031.py
similarity index 100%
rename from pactest/tests/sync031.py
rename to test/pacman/tests/sync031.py
diff --git a/pactest/tests/sync040.py b/test/pacman/tests/sync040.py
similarity index 100%
rename from pactest/tests/sync040.py
rename to test/pacman/tests/sync040.py
diff --git a/pactest/tests/sync041.py b/test/pacman/tests/sync041.py
similarity index 100%
rename from pactest/tests/sync041.py
rename to test/pacman/tests/sync041.py
diff --git a/pactest/tests/sync042.py b/test/pacman/tests/sync042.py
similarity index 100%
rename from pactest/tests/sync042.py
rename to test/pacman/tests/sync042.py
diff --git a/pactest/tests/sync043.py b/test/pacman/tests/sync043.py
similarity index 100%
rename from pactest/tests/sync043.py
rename to test/pacman/tests/sync043.py
diff --git a/pactest/tests/sync044.py b/test/pacman/tests/sync044.py
similarity index 100%
rename from pactest/tests/sync044.py
rename to test/pacman/tests/sync044.py
diff --git a/pactest/tests/sync045.py b/test/pacman/tests/sync045.py
similarity index 100%
rename from pactest/tests/sync045.py
rename to test/pacman/tests/sync045.py
diff --git a/pactest/tests/sync050.py b/test/pacman/tests/sync050.py
similarity index 100%
rename from pactest/tests/sync050.py
rename to test/pacman/tests/sync050.py
diff --git a/pactest/tests/sync100.py b/test/pacman/tests/sync100.py
similarity index 100%
rename from pactest/tests/sync100.py
rename to test/pacman/tests/sync100.py
diff --git a/pactest/tests/sync1000.py b/test/pacman/tests/sync1000.py
similarity index 100%
rename from pactest/tests/sync1000.py
rename to test/pacman/tests/sync1000.py
diff --git a/pactest/tests/sync1003.py b/test/pacman/tests/sync1003.py
similarity index 100%
rename from pactest/tests/sync1003.py
rename to test/pacman/tests/sync1003.py
diff --git a/pactest/tests/sync1004.py b/test/pacman/tests/sync1004.py
similarity index 100%
rename from pactest/tests/sync1004.py
rename to test/pacman/tests/sync1004.py
diff --git a/pactest/tests/sync1008.py b/test/pacman/tests/sync1008.py
similarity index 100%
rename from pactest/tests/sync1008.py
rename to test/pacman/tests/sync1008.py
diff --git a/pactest/tests/sync101.py b/test/pacman/tests/sync101.py
similarity index 100%
rename from pactest/tests/sync101.py
rename to test/pacman/tests/sync101.py
diff --git a/pactest/tests/sync102.py b/test/pacman/tests/sync102.py
similarity index 100%
rename from pactest/tests/sync102.py
rename to test/pacman/tests/sync102.py
diff --git a/pactest/tests/sync103.py b/test/pacman/tests/sync103.py
similarity index 100%
rename from pactest/tests/sync103.py
rename to test/pacman/tests/sync103.py
diff --git a/pactest/tests/sync104.py b/test/pacman/tests/sync104.py
similarity index 100%
rename from pactest/tests/sync104.py
rename to test/pacman/tests/sync104.py
diff --git a/pactest/tests/sync110.py b/test/pacman/tests/sync110.py
similarity index 100%
rename from pactest/tests/sync110.py
rename to test/pacman/tests/sync110.py
diff --git a/pactest/tests/sync1100.py b/test/pacman/tests/sync1100.py
similarity index 100%
rename from pactest/tests/sync1100.py
rename to test/pacman/tests/sync1100.py
diff --git a/pactest/tests/sync1101.py b/test/pacman/tests/sync1101.py
similarity index 100%
rename from pactest/tests/sync1101.py
rename to test/pacman/tests/sync1101.py
diff --git a/pactest/tests/sync1102.py b/test/pacman/tests/sync1102.py
similarity index 100%
rename from pactest/tests/sync1102.py
rename to test/pacman/tests/sync1102.py
diff --git a/pactest/tests/sync1103.py b/test/pacman/tests/sync1103.py
similarity index 100%
rename from pactest/tests/sync1103.py
rename to test/pacman/tests/sync1103.py
diff --git a/pactest/tests/sync120.py b/test/pacman/tests/sync120.py
similarity index 100%
rename from pactest/tests/sync120.py
rename to test/pacman/tests/sync120.py
diff --git a/pactest/tests/sync130.py b/test/pacman/tests/sync130.py
similarity index 100%
rename from pactest/tests/sync130.py
rename to test/pacman/tests/sync130.py
diff --git a/pactest/tests/sync131.py b/test/pacman/tests/sync131.py
similarity index 100%
rename from pactest/tests/sync131.py
rename to test/pacman/tests/sync131.py
diff --git a/pactest/tests/sync132.py b/test/pacman/tests/sync132.py
similarity index 100%
rename from pactest/tests/sync132.py
rename to test/pacman/tests/sync132.py
diff --git a/pactest/tests/sync133.py b/test/pacman/tests/sync133.py
similarity index 100%
rename from pactest/tests/sync133.py
rename to test/pacman/tests/sync133.py
diff --git a/pactest/tests/sync134.py b/test/pacman/tests/sync134.py
similarity index 100%
rename from pactest/tests/sync134.py
rename to test/pacman/tests/sync134.py
diff --git a/pactest/tests/sync135.py b/test/pacman/tests/sync135.py
similarity index 100%
rename from pactest/tests/sync135.py
rename to test/pacman/tests/sync135.py
diff --git a/pactest/tests/sync136.py b/test/pacman/tests/sync136.py
similarity index 100%
rename from pactest/tests/sync136.py
rename to test/pacman/tests/sync136.py
diff --git a/pactest/tests/sync137.py b/test/pacman/tests/sync137.py
similarity index 100%
rename from pactest/tests/sync137.py
rename to test/pacman/tests/sync137.py
diff --git a/pactest/tests/sync138.py b/test/pacman/tests/sync138.py
similarity index 100%
rename from pactest/tests/sync138.py
rename to test/pacman/tests/sync138.py
diff --git a/pactest/tests/sync150.py b/test/pacman/tests/sync150.py
similarity index 100%
rename from pactest/tests/sync150.py
rename to test/pacman/tests/sync150.py
diff --git a/pactest/tests/sync200.py.in b/test/pacman/tests/sync200.py.in
similarity index 100%
rename from pactest/tests/sync200.py.in
rename to test/pacman/tests/sync200.py.in
diff --git a/pactest/tests/sync300.py b/test/pacman/tests/sync300.py
similarity index 100%
rename from pactest/tests/sync300.py
rename to test/pacman/tests/sync300.py
diff --git a/pactest/tests/sync301.py b/test/pacman/tests/sync301.py
similarity index 100%
rename from pactest/tests/sync301.py
rename to test/pacman/tests/sync301.py
diff --git a/pactest/tests/sync400.py b/test/pacman/tests/sync400.py
similarity index 100%
rename from pactest/tests/sync400.py
rename to test/pacman/tests/sync400.py
diff --git a/pactest/tests/sync401.py b/test/pacman/tests/sync401.py
similarity index 100%
rename from pactest/tests/sync401.py
rename to test/pacman/tests/sync401.py
diff --git a/pactest/tests/sync402.py b/test/pacman/tests/sync402.py
similarity index 100%
rename from pactest/tests/sync402.py
rename to test/pacman/tests/sync402.py
diff --git a/pactest/tests/sync403.py b/test/pacman/tests/sync403.py
similarity index 100%
rename from pactest/tests/sync403.py
rename to test/pacman/tests/sync403.py
diff --git a/pactest/tests/sync404.py b/test/pacman/tests/sync404.py
similarity index 100%
rename from pactest/tests/sync404.py
rename to test/pacman/tests/sync404.py
diff --git a/pactest/tests/sync405.py b/test/pacman/tests/sync405.py
similarity index 100%
rename from pactest/tests/sync405.py
rename to test/pacman/tests/sync405.py
diff --git a/pactest/tests/sync406.py b/test/pacman/tests/sync406.py
similarity index 100%
rename from pactest/tests/sync406.py
rename to test/pacman/tests/sync406.py
diff --git a/pactest/tests/sync500.py b/test/pacman/tests/sync500.py
similarity index 100%
rename from pactest/tests/sync500.py
rename to test/pacman/tests/sync500.py
diff --git a/pactest/tests/sync501.py b/test/pacman/tests/sync501.py
similarity index 100%
rename from pactest/tests/sync501.py
rename to test/pacman/tests/sync501.py
diff --git a/pactest/tests/sync890.py b/test/pacman/tests/sync890.py
similarity index 100%
rename from pactest/tests/sync890.py
rename to test/pacman/tests/sync890.py
diff --git a/pactest/tests/sync891.py b/test/pacman/tests/sync891.py
similarity index 100%
rename from pactest/tests/sync891.py
rename to test/pacman/tests/sync891.py
diff --git a/pactest/tests/sync892.py b/test/pacman/tests/sync892.py
similarity index 100%
rename from pactest/tests/sync892.py
rename to test/pacman/tests/sync892.py
diff --git a/pactest/tests/sync893.py b/test/pacman/tests/sync893.py
similarity index 100%
rename from pactest/tests/sync893.py
rename to test/pacman/tests/sync893.py
diff --git a/pactest/tests/sync895.py b/test/pacman/tests/sync895.py
similarity index 100%
rename from pactest/tests/sync895.py
rename to test/pacman/tests/sync895.py
diff --git a/pactest/tests/sync896.py b/test/pacman/tests/sync896.py
similarity index 100%
rename from pactest/tests/sync896.py
rename to test/pacman/tests/sync896.py
diff --git a/pactest/tests/sync897.py b/test/pacman/tests/sync897.py
similarity index 100%
rename from pactest/tests/sync897.py
rename to test/pacman/tests/sync897.py
diff --git a/pactest/tests/sync898.py b/test/pacman/tests/sync898.py
similarity index 100%
rename from pactest/tests/sync898.py
rename to test/pacman/tests/sync898.py
diff --git a/pactest/tests/sync899.py b/test/pacman/tests/sync899.py
similarity index 100%
rename from pactest/tests/sync899.py
rename to test/pacman/tests/sync899.py
diff --git a/pactest/tests/sync900.py b/test/pacman/tests/sync900.py
similarity index 100%
rename from pactest/tests/sync900.py
rename to test/pacman/tests/sync900.py
diff --git a/pactest/tests/sync901.py b/test/pacman/tests/sync901.py
similarity index 100%
rename from pactest/tests/sync901.py
rename to test/pacman/tests/sync901.py
diff --git a/pactest/tests/sync990.py b/test/pacman/tests/sync990.py
similarity index 100%
rename from pactest/tests/sync990.py
rename to test/pacman/tests/sync990.py
diff --git a/pactest/tests/sync992.py b/test/pacman/tests/sync992.py
similarity index 100%
rename from pactest/tests/sync992.py
rename to test/pacman/tests/sync992.py
diff --git a/pactest/tests/sync993.py b/test/pacman/tests/sync993.py
similarity index 100%
rename from pactest/tests/sync993.py
rename to test/pacman/tests/sync993.py
diff --git a/pactest/tests/sync999.py b/test/pacman/tests/sync999.py
similarity index 100%
rename from pactest/tests/sync999.py
rename to test/pacman/tests/sync999.py
diff --git a/pactest/tests/trans001.py b/test/pacman/tests/trans001.py
similarity index 100%
rename from pactest/tests/trans001.py
rename to test/pacman/tests/trans001.py
diff --git a/pactest/tests/type001.py b/test/pacman/tests/type001.py
similarity index 100%
rename from pactest/tests/type001.py
rename to test/pacman/tests/type001.py
diff --git a/pactest/tests/unresolvable001.py b/test/pacman/tests/unresolvable001.py
similarity index 100%
rename from pactest/tests/unresolvable001.py
rename to test/pacman/tests/unresolvable001.py
diff --git a/pactest/tests/upgrade001.py b/test/pacman/tests/upgrade001.py
similarity index 100%
rename from pactest/tests/upgrade001.py
rename to test/pacman/tests/upgrade001.py
diff --git a/pactest/tests/upgrade002.py b/test/pacman/tests/upgrade002.py
similarity index 100%
rename from pactest/tests/upgrade002.py
rename to test/pacman/tests/upgrade002.py
diff --git a/pactest/tests/upgrade003.py b/test/pacman/tests/upgrade003.py
similarity index 100%
rename from pactest/tests/upgrade003.py
rename to test/pacman/tests/upgrade003.py
diff --git a/pactest/tests/upgrade004.py b/test/pacman/tests/upgrade004.py
similarity index 100%
rename from pactest/tests/upgrade004.py
rename to test/pacman/tests/upgrade004.py
diff --git a/pactest/tests/upgrade005.py b/test/pacman/tests/upgrade005.py
similarity index 100%
rename from pactest/tests/upgrade005.py
rename to test/pacman/tests/upgrade005.py
diff --git a/pactest/tests/upgrade010.py b/test/pacman/tests/upgrade010.py
similarity index 100%
rename from pactest/tests/upgrade010.py
rename to test/pacman/tests/upgrade010.py
diff --git a/pactest/tests/upgrade011.py b/test/pacman/tests/upgrade011.py
similarity index 100%
rename from pactest/tests/upgrade011.py
rename to test/pacman/tests/upgrade011.py
diff --git a/pactest/tests/upgrade012.py b/test/pacman/tests/upgrade012.py
similarity index 100%
rename from pactest/tests/upgrade012.py
rename to test/pacman/tests/upgrade012.py
diff --git a/pactest/tests/upgrade013.py b/test/pacman/tests/upgrade013.py
similarity index 100%
rename from pactest/tests/upgrade013.py
rename to test/pacman/tests/upgrade013.py
diff --git a/pactest/tests/upgrade014.py b/test/pacman/tests/upgrade014.py
similarity index 100%
rename from pactest/tests/upgrade014.py
rename to test/pacman/tests/upgrade014.py
diff --git a/pactest/tests/upgrade015.py b/test/pacman/tests/upgrade015.py
similarity index 100%
rename from pactest/tests/upgrade015.py
rename to test/pacman/tests/upgrade015.py
diff --git a/pactest/tests/upgrade016.py b/test/pacman/tests/upgrade016.py
similarity index 100%
rename from pactest/tests/upgrade016.py
rename to test/pacman/tests/upgrade016.py
diff --git a/pactest/tests/upgrade020.py b/test/pacman/tests/upgrade020.py
similarity index 100%
rename from pactest/tests/upgrade020.py
rename to test/pacman/tests/upgrade020.py
diff --git a/pactest/tests/upgrade021.py b/test/pacman/tests/upgrade021.py
similarity index 100%
rename from pactest/tests/upgrade021.py
rename to test/pacman/tests/upgrade021.py
diff --git a/pactest/tests/upgrade022.py b/test/pacman/tests/upgrade022.py
similarity index 100%
rename from pactest/tests/upgrade022.py
rename to test/pacman/tests/upgrade022.py
diff --git a/pactest/tests/upgrade023.py b/test/pacman/tests/upgrade023.py
similarity index 100%
rename from pactest/tests/upgrade023.py
rename to test/pacman/tests/upgrade023.py
diff --git a/pactest/tests/upgrade024.py b/test/pacman/tests/upgrade024.py
similarity index 100%
rename from pactest/tests/upgrade024.py
rename to test/pacman/tests/upgrade024.py
diff --git a/pactest/tests/upgrade025.py b/test/pacman/tests/upgrade025.py
similarity index 100%
rename from pactest/tests/upgrade025.py
rename to test/pacman/tests/upgrade025.py
diff --git a/pactest/tests/upgrade026.py b/test/pacman/tests/upgrade026.py
similarity index 100%
rename from pactest/tests/upgrade026.py
rename to test/pacman/tests/upgrade026.py
diff --git a/pactest/tests/upgrade030.py b/test/pacman/tests/upgrade030.py
similarity index 100%
rename from pactest/tests/upgrade030.py
rename to test/pacman/tests/upgrade030.py
diff --git a/pactest/tests/upgrade031.py b/test/pacman/tests/upgrade031.py
similarity index 100%
rename from pactest/tests/upgrade031.py
rename to test/pacman/tests/upgrade031.py
diff --git a/pactest/tests/upgrade032.py b/test/pacman/tests/upgrade032.py
similarity index 100%
rename from pactest/tests/upgrade032.py
rename to test/pacman/tests/upgrade032.py
diff --git a/pactest/tests/upgrade040.py b/test/pacman/tests/upgrade040.py
similarity index 100%
rename from pactest/tests/upgrade040.py
rename to test/pacman/tests/upgrade040.py
diff --git a/pactest/tests/upgrade041.py b/test/pacman/tests/upgrade041.py
similarity index 100%
rename from pactest/tests/upgrade041.py
rename to test/pacman/tests/upgrade041.py
diff --git a/pactest/tests/upgrade042.py b/test/pacman/tests/upgrade042.py
similarity index 100%
rename from pactest/tests/upgrade042.py
rename to test/pacman/tests/upgrade042.py
diff --git a/pactest/tests/upgrade043.py b/test/pacman/tests/upgrade043.py
similarity index 100%
rename from pactest/tests/upgrade043.py
rename to test/pacman/tests/upgrade043.py
diff --git a/pactest/tests/upgrade045.py b/test/pacman/tests/upgrade045.py
similarity index 100%
rename from pactest/tests/upgrade045.py
rename to test/pacman/tests/upgrade045.py
diff --git a/pactest/tests/upgrade046.py b/test/pacman/tests/upgrade046.py
similarity index 100%
rename from pactest/tests/upgrade046.py
rename to test/pacman/tests/upgrade046.py
diff --git a/pactest/tests/upgrade050.py b/test/pacman/tests/upgrade050.py
similarity index 100%
rename from pactest/tests/upgrade050.py
rename to test/pacman/tests/upgrade050.py
diff --git a/pactest/tests/upgrade051.py b/test/pacman/tests/upgrade051.py
similarity index 100%
rename from pactest/tests/upgrade051.py
rename to test/pacman/tests/upgrade051.py
diff --git a/pactest/tests/upgrade052.py b/test/pacman/tests/upgrade052.py
similarity index 100%
rename from pactest/tests/upgrade052.py
rename to test/pacman/tests/upgrade052.py
diff --git a/pactest/tests/upgrade053.py b/test/pacman/tests/upgrade053.py
similarity index 100%
rename from pactest/tests/upgrade053.py
rename to test/pacman/tests/upgrade053.py
diff --git a/pactest/tests/upgrade054.py b/test/pacman/tests/upgrade054.py
similarity index 100%
rename from pactest/tests/upgrade054.py
rename to test/pacman/tests/upgrade054.py
diff --git a/pactest/tests/upgrade055.py b/test/pacman/tests/upgrade055.py
similarity index 100%
rename from pactest/tests/upgrade055.py
rename to test/pacman/tests/upgrade055.py
diff --git a/pactest/tests/upgrade056.py b/test/pacman/tests/upgrade056.py
similarity index 100%
rename from pactest/tests/upgrade056.py
rename to test/pacman/tests/upgrade056.py
diff --git a/pactest/tests/upgrade057.py b/test/pacman/tests/upgrade057.py
similarity index 100%
rename from pactest/tests/upgrade057.py
rename to test/pacman/tests/upgrade057.py
diff --git a/pactest/tests/upgrade058.py b/test/pacman/tests/upgrade058.py
similarity index 100%
rename from pactest/tests/upgrade058.py
rename to test/pacman/tests/upgrade058.py
diff --git a/pactest/tests/upgrade059.py b/test/pacman/tests/upgrade059.py
similarity index 100%
rename from pactest/tests/upgrade059.py
rename to test/pacman/tests/upgrade059.py
diff --git a/pactest/tests/upgrade060.py b/test/pacman/tests/upgrade060.py
similarity index 100%
rename from pactest/tests/upgrade060.py
rename to test/pacman/tests/upgrade060.py
diff --git a/pactest/tests/upgrade061.py b/test/pacman/tests/upgrade061.py
similarity index 100%
rename from pactest/tests/upgrade061.py
rename to test/pacman/tests/upgrade061.py
diff --git a/pactest/tests/upgrade070.py b/test/pacman/tests/upgrade070.py
similarity index 100%
rename from pactest/tests/upgrade070.py
rename to test/pacman/tests/upgrade070.py
diff --git a/pactest/tests/upgrade071.py b/test/pacman/tests/upgrade071.py
similarity index 100%
rename from pactest/tests/upgrade071.py
rename to test/pacman/tests/upgrade071.py
diff --git a/pactest/tests/upgrade072.py b/test/pacman/tests/upgrade072.py
similarity index 100%
rename from pactest/tests/upgrade072.py
rename to test/pacman/tests/upgrade072.py
diff --git a/pactest/tests/upgrade073.py b/test/pacman/tests/upgrade073.py
similarity index 100%
rename from pactest/tests/upgrade073.py
rename to test/pacman/tests/upgrade073.py
diff --git a/pactest/tests/upgrade074.py b/test/pacman/tests/upgrade074.py
similarity index 100%
rename from pactest/tests/upgrade074.py
rename to test/pacman/tests/upgrade074.py
diff --git a/pactest/tests/upgrade075.py b/test/pacman/tests/upgrade075.py
similarity index 100%
rename from pactest/tests/upgrade075.py
rename to test/pacman/tests/upgrade075.py
diff --git a/pactest/tests/upgrade076.py b/test/pacman/tests/upgrade076.py
similarity index 100%
rename from pactest/tests/upgrade076.py
rename to test/pacman/tests/upgrade076.py
diff --git a/pactest/tests/upgrade080.py b/test/pacman/tests/upgrade080.py
similarity index 100%
rename from pactest/tests/upgrade080.py
rename to test/pacman/tests/upgrade080.py
diff --git a/pactest/tests/upgrade081.py b/test/pacman/tests/upgrade081.py
similarity index 100%
rename from pactest/tests/upgrade081.py
rename to test/pacman/tests/upgrade081.py
diff --git a/pactest/tests/upgrade082.py b/test/pacman/tests/upgrade082.py
similarity index 100%
rename from pactest/tests/upgrade082.py
rename to test/pacman/tests/upgrade082.py
diff --git a/pactest/tests/upgrade083.py b/test/pacman/tests/upgrade083.py
similarity index 100%
rename from pactest/tests/upgrade083.py
rename to test/pacman/tests/upgrade083.py
diff --git a/pactest/tests/upgrade084.py b/test/pacman/tests/upgrade084.py
similarity index 100%
rename from pactest/tests/upgrade084.py
rename to test/pacman/tests/upgrade084.py
diff --git a/pactest/tests/upgrade090.py b/test/pacman/tests/upgrade090.py
similarity index 100%
rename from pactest/tests/upgrade090.py
rename to test/pacman/tests/upgrade090.py
diff --git a/pactest/tests/xfercommand001.py b/test/pacman/tests/xfercommand001.py
similarity index 100%
rename from pactest/tests/xfercommand001.py
rename to test/pacman/tests/xfercommand001.py
diff --git a/pactest/util.py b/test/pacman/util.py
similarity index 100%
rename from pactest/util.py
rename to test/pacman/util.py
diff --git a/pactest/vercmptest.sh b/test/pacman/vercmptest.sh
similarity index 100%
rename from pactest/vercmptest.sh
rename to test/pacman/vercmptest.sh