diff --git a/tests/usr.bin/make/Makefile b/tests/usr.bin/make/Makefile
index a95183d707ea..655dfa58a43b 100644
--- a/tests/usr.bin/make/Makefile
+++ b/tests/usr.bin/make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/08/22 16:45:32 apb Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/17 11:21:17 rillig Exp $
 
 # The tests for make(1) are maintained in src/usr.bin/make/unit-tests
 # (UNIT_TESTS_DISTDIR).  We copy them verbatim to ${FILESDIR}/unit-tests
@@ -28,11 +28,10 @@ UNIT_TESTS_DISTDIR=	${NETBSDSRCDIR}/usr.bin/make/unit-tests
 DISTFILES!=	(cd ${UNIT_TESTS_DISTDIR} && echo Makefile *.mk *.exp)
 
 # Instruct bsd.files.mk to make the copies
-.for f in ${DISTFILES}
-_file := ${UNIT_TESTS_DISTDIR}/${f}
-FILES+= ${UNIT_TESTS_DISTDIR}/${f}
-FILESNAME_${_file} := ${_file:T}
-FILESDIR_${_file} := ${UNIT_TESTS_DIR}
+.for f in ${DISTFILES:S,^,${UNIT_TESTS_DISTDIR}/,}
+FILES+=		${f}
+FILESNAME_${f}=	${f:T}
+FILESDIR_${f}=	${UNIT_TESTS_DIR}
 .endfor
 
 .include <bsd.test.mk>