Index: head/Mk/Uses/perl5.mk
===================================================================
--- head/Mk/Uses/perl5.mk
+++ head/Mk/Uses/perl5.mk
@@ -308,7 +308,7 @@
 	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || :
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || :
 
-.if !target(do-test) && !defined(NO_PERL5_TEST)
+.if !target(do-test) && (${USE_PERL5:Mmodbuild*} || ${USE_PERL5:Mconfigure})
 TEST_TARGET?=	test
 TEST_WRKSRC?=	${BUILD_WRKSRC}
 do-test:
Index: head/ftp/curl/Makefile
===================================================================
--- head/ftp/curl/Makefile
+++ head/ftp/curl/Makefile
@@ -48,7 +48,6 @@
 		ac_cv_func_SSLv2_client_method=no
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-NO_PERL5_TEST=	yes
 TEST_ENV=	${MAKE_ENV} LC_ALL=C
 TEST_TARGET=	test
 USE_PERL5=	build