diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 434b1367ff1f..6efed8582154 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -15,25 +15,22 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKE_ENV=	datadir=${DATADIR} prefix=${PREFIX}
 MAKE_ARGS=	LD=${CC}
+TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS
 
-regression-test:
-	@ cd ${WRKSRC} && ${MAKE} check
-
-post-build tests test: regression-test
-
 do-install:
-	@ ${MKDIR} ${STAGEDIR}${DATADIR}
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/figlet ${STAGEDIR}${PREFIX}/bin
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${STAGEDIR}${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/figlist ${STAGEDIR}${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${STAGEDIR}${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${STAGEDIR}${DATADIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${STAGEDIR}${DATADIR}
-	@ cd ${WRKSRC} && ${INSTALL_MAN} *.6 ${STAGEDIR}${PREFIX}/man/man6
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/figlet ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/figlist ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${STAGEDIR}${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/*.6 ${STAGEDIR}${MANPREFIX}/man/man6
 
-	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/figfont.txt ${STAGEDIR}${DOCSDIR}
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/figfont.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>