Index: projects/release-pkg/lib/libc/tests/tls/dso/Makefile
===================================================================
--- projects/release-pkg/lib/libc/tests/tls/dso/Makefile	(revision 295218)
+++ projects/release-pkg/lib/libc/tests/tls/dso/Makefile	(revision 295219)
@@ -1,17 +1,21 @@
 # $FreeBSD$
 
+PACKAGE= tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 OBJTOP=		${.OBJDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
 
 LIB=		h_tls_dlopen
 SHLIB_NAME=	h_tls_dlopen.so
 SRCS=		h_tls_dlopen.c
 
 MAN=
 
 LIBDIR=		${TESTSBASE}/lib/libc/tls
 SHLIB_MAJOR=	1
 
 .include "../../Makefile.netbsd-tests"
 
 .include <bsd.lib.mk>
Index: projects/release-pkg/tests/sys/geom/class/uzip/Makefile
===================================================================
--- projects/release-pkg/tests/sys/geom/class/uzip/Makefile	(revision 295218)
+++ projects/release-pkg/tests/sys/geom/class/uzip/Makefile	(revision 295219)
@@ -1,46 +1,47 @@
 #
 # $FreeBSD$
 #
 # Regression test for geom_uzip.
 #
 
 PACKAGE=	tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 IMAGE=		1.img
 ZIMAGE=		${IMAGE}.uzip
 UZIMAGE=	${ZIMAGE}.uue
 
 CLEANFILES+=	${IMAGE} ${UZIMAGE} ${ZIMAGE}
 
 ${IMAGE}:
 	makefs -s 1048576 ${.TARGET} ${.CURDIR}/etalon
 
 ${ZIMAGE}: ${IMAGE}
 	mkuzip -o ${.TARGET} ${.ALLSRC}
 
 ${UZIMAGE}: ${IMAGE} ${ZIMAGE}
 	printf "#\n# $$" >${.TARGET}
 	printf "FreeBSD$$\n#\n\n" >> ${.TARGET}
 	uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET}
 
 FILES+=		conf.sh
 FILESNAME_conf.sh=	conf.sh
 
 FILES+=		${UZIMAGE}
 FILESDIR=	${TESTSDIR}
 
-FILESGROUPS=	FILES etalon
+FILESGROUPS+=	FILES etalon
 etalon+=	etalon/etalon.txt
 etalonDIR=	${TESTSDIR}/etalon
+FILESPACKAGE=	${PACKAGE}
+etalonPACKAGE=	${PACKAGE}
 
 TAP_TESTS_SH+=	1_test
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
 .endfor
 
 .include <bsd.test.mk>