diff -r a2908416b7cc -r 008c75a5e08d test/Makefile.am
--- a/test/Makefile.am	Mon Sep 01 12:19:32 2014 +0100
+++ b/test/Makefile.am	Mon Jul 04 10:48:18 2016 +0100
@@ -4,7 +4,7 @@
 if HAVE_LUA
   check_SCRIPTS += lua mult-install
 endif
-check_SCRIPTS += order
+check_SCRIPTS += order non-ascii relative-root
 
 relocate:	relocate.sh primary.xml.gz
 	cp $(srcdir)/relocate.sh relocate
@@ -24,6 +24,12 @@
 order:	order.sh primary.xml.gz
 	cp $(srcdir)/order.sh order
 
+non-ascii:	non-ascii.sh primary.xml.gz
+	cp $(srcdir)/non-ascii.sh non-ascii
+
+relative-root:	relative-root.sh primary.xml.gz
+	cp $(srcdir)/relative-root.sh relative-root
+
 lua:	lua.sh primary.xml.gz
 	cp $(srcdir)/lua.sh lua
 
@@ -40,25 +46,26 @@
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh.spec
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh2.spec
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/filesystem.spec
-	mkdir -p base/rpms
-	mv rpmbuild/RPMS/noarch/*.rpm base/rpms
+	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/aljip.spec
+	mkdir -p base/Packages
+	mv rpmbuild/RPMS/noarch/*.rpm base/Packages
 	rm -rf rpmbuild
-	createrepo --simple-md-filenames -o base base/rpms
+	createrepo --simple-md-filenames base
 
 updates/repodata/primary.xml.gz:	zip.spec Makefile
 	rm -rf rpmbuild updates
 	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
 	rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version 2" \
 	  -bb $(srcdir)/zip.spec
-	mkdir -p updates/rpms
-	mv rpmbuild/RPMS/noarch/*.rpm updates/rpms
+	mkdir -p updates/Packages
+	mv rpmbuild/RPMS/noarch/*.rpm updates/Packages
 	rm -rf rpmbuild
-	createrepo --simple-md-filenames -o updates updates/rpms
+	createrepo --simple-md-filenames updates
 
 primary.xml.gz:	base/repodata/primary.xml.gz
 	cp base/repodata/primary.xml.gz base/repodata/filelists.xml.gz .
 	rm -rf rpms
-	ln -s base/rpms .
+	ln -s base/Packages rpms
 
 TESTS = $(check_SCRIPTS)
 
@@ -68,7 +75,10 @@
 	zsh.spec		\
 	zsh2.spec		\
 	filesystem.spec		\
+	aljip.spec		\
 	order.sh		\
+	non-ascii.sh		\
+	relative-root.sh	\
 	mult-install.sh		\
 	lua.sh			\
 	remove.sh		\