diff -r ea1c42c3a780 -r 4b52e95a0104 tests/Makefile.am
--- a/tests/Makefile.am	Tue Jun 28 19:05:38 2016 +0100
+++ b/tests/Makefile.am	Thu Jul 07 19:03:54 2016 +0100
@@ -38,14 +38,12 @@
 	$(BUILD_RPM) $(srcdir)/unsatisfiable.spec
 	$(BUILD_RPM) $(srcdir)/uninstallable.spec
 	$(BUILD_RPM) $(srcdir)/badpostun.spec
-	mkdir -p yum-repo-test-dir/rpms
-	mv rpmbuild/RPMS/noarch/*.rpm yum-repo-test-dir/rpms
+	mkdir -p yum-repo-test-dir/Packages
+	mv rpmbuild/RPMS/noarch/*.rpm yum-repo-test-dir/Packages
 	rm -rf rpmbuild
-	cp $(srcdir)/comps.xml yum-repo-test-dir/rpms
-	$(CREATEREPO) --simple-md-filenames -g comps.xml -o yum-repo-test-dir \
-	  yum-repo-test-dir/rpms
-	$(RM) yum-repo-test-dir/rpms/comps.xml
-	cp $(srcdir)/comps.xml yum-repo-test-dir/repodata
+	cp $(srcdir)/comps.xml yum-repo-test-dir
+	$(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 \
@@ -56,9 +54,10 @@
 razor-test-dir/var/lib/razor/system.rzdb: primary.xml.gz
 	$(RM) -r razor-test-dir
 	$(RAZOR) --root=file:razor-test-dir init
-	$(RAZOR) --root=file:razor-test-dir \
-	  --url=file://localhost/`pwd`/yum-repo-test-dir import-yum
-	$(RAZOR) --root=file:razor-test-dir install zap zappy zappy2 zappy-tools
+	$(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
+	  --root=file:razor-test-dir import-yum
+	$(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
+	  --root=file:razor-test-dir install zap zappy zappy2 zappy-tools
 
 endif