diff -r 8c80282a3888 -r c9eb7aa21ff4 tests/Makefile.am
--- a/tests/Makefile.am	Tue Jul 05 12:48:24 2016 +0100
+++ b/tests/Makefile.am	Tue Apr 24 18:49:55 2018 +0100
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = zsh.spec zsh2.spec zip.spec zap.spec filesystem.spec zappy.spec \
     zappy2.spec unsatisfiable.spec uninstallable.spec badpostun.spec comps.xml \
-    glib.supp.in README xvfb-run
+    distribution-local-comps.xml glib.supp.in README xvfb-run
 
 pkg_V_rpmbuild = $(pkg_v_rpmbuild_$(V))
 pkg_v_rpmbuild_ = $(pkg_v_rpmbuild_$(AM_DEFAULT_VERBOSITY))
@@ -13,7 +13,8 @@
 if HAVE_CHECK_TOOLS
 
 noinst_DATA = glib.supp yum-repo-test-dir/repodata/primary.xml.gz \
-	primary.xml.gz razor-test-dir/var/lib/razor/system.rzdb
+	distribution-local-test-dir/repodata/primary.xml.gz \
+	razor-test-dir/var/lib/razor/system.rzdb
 
 if HAVE_VALGRIND_3_9
 %.supp: %.supp.in
@@ -23,6 +24,22 @@
 	grep -v '^ *match-leak-kinds: ' $< > $@
 endif
 
+distribution-local-test-dir/repodata/primary.xml.gz: filesystem.spec \
+    zappy.spec Makefile
+	rm -rf rpmbuild distribution-local-test-dir
+	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
+	$(BUILD_RPM) $(srcdir)/filesystem.spec
+	$(BUILD_RPM) $(srcdir)/zappy.spec
+	mkdir -p distribution-local-test-dir/Packages
+	mv rpmbuild/RPMS/noarch/*.rpm distribution-local-test-dir/Packages
+	rm -rf rpmbuild
+	cp $(srcdir)/distribution-local-comps.xml \
+	  distribution-local-test-dir/comps.xml
+	$(CREATEREPO) --simple-md-filenames -g comps.xml \
+	  distribution-local-test-dir
+	mv distribution-local-test-dir/comps.xml \
+	  distribution-local-test-dir/repodata
+
 yum-repo-test-dir/repodata/primary.xml.gz: zsh.spec zsh2.spec zip.spec \
     zap.spec filesystem.spec zappy.spec zappy2.spec unsatisfiable.spec \
     uninstallable.spec badpostun.spec Makefile
@@ -45,13 +62,7 @@
 	$(CREATEREPO) --simple-md-filenames -g comps.xml yum-repo-test-dir
 	mv yum-repo-test-dir/comps.xml yum-repo-test-dir/repodata
 
-primary.xml.gz: yum-repo-test-dir/repodata/primary.xml.gz
-	cp yum-repo-test-dir/repodata/primary.xml.gz \
-	  yum-repo-test-dir/repodata/filelists.xml.gz .
-	rm -rf rpms
-	ln -s yum-repo-test-dir/rpms .
-
-razor-test-dir/var/lib/razor/system.rzdb: primary.xml.gz
+razor-test-dir/var/lib/razor/system.rzdb: yum-repo-test-dir/repodata/primary.xml.gz
 	$(RM) -r razor-test-dir
 	$(RAZOR) --root=file:razor-test-dir init
 	$(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
@@ -71,7 +82,7 @@
 	done
 
 clean-local:
-	rm -rf yum-repo-test-dir razor-test-dir
-	rm -f primary.xml.gz filelists.xml.gz rpms rawhide.rzdb
+	rm -rf yum-repo-test-dir distribution-local-test-dir razor-test-dir
+	rm -f rawhide.rzdb
 
 CLEANFILES = glib.supp