diff --git a/devel/z88dk/Makefile b/devel/z88dk/Makefile
index 03f810445f11..399699127a30 100644
--- a/devel/z88dk/Makefile
+++ b/devel/z88dk/Makefile
@@ -1,53 +1,72 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	z88dk
 PORTVERSION=	2.1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Complete Z80/Z180 development kit
 
 LICENSE=	ClArtistic
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+TEST_DEPENDS=	dos2unix:converters/unix2dos \
+		p5-CPU-Z80-Assembler>=0:devel/p5-CPU-Z80-Assembler \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Capture-Tiny-Extended>=0:devel/p5-Capture-Tiny-Extended \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Data-HexDump>=0:devel/p5-Data-HexDump \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Iterator-Simple-Lookahead>=0:devel/p5-Iterator-Simple-Lookahead \
+		p5-List-Uniq>=0:devel/p5-List-Uniq \
+		p5-Modern-Perl>=0:lang/p5-Modern-Perl \
+		p5-Object-Tiny-RW>=0:devel/p5-Object-Tiny-RW \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Template-Plugin-YAML>=0:textproc/p5-Template-Plugin-YAML \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-HexDifferences>=0:devel/p5-Test-HexDifferences \
+		p5-Text-Table>=0:textproc/p5-Text-Table
+
 USES=		gmake gnome shebangfix tar:tgz
 USE_GNOME=	libxml2
 MAKE_ENV=	ZCCCFG=${WRKSRC}/lib/config
 SHEBANG_FILES=	src/z80asm/asmpp.pl
+TEST_TARGET=	testsuite test
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_JOBS_UNSAFE=	../../z80asm: No such file or directory
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,"gcc,"${CC},' \
 		${WRKSRC}/src/z80asm/lib/t/array.t \
 		${WRKSRC}/src/z80asm/lib/t/class.t \
 		${WRKSRC}/src/z80asm/lib/t/classhash.t \
 		${WRKSRC}/src/z80asm/lib/t/classlist.t \
 		${WRKSRC}/src/z80asm/lib/t/list.t \
 		${WRKSRC}/src/z80asm/lib/t/srcfile.t \
 		${WRKSRC}/src/z80asm/lib/t/strhash.t \
 		${WRKSRC}/src/z80asm/t/test_utils.pl
 	@${REINPLACE_CMD} -e 's,"make,"${MAKE_CMD},' \
 		${WRKSRC}/src/z80asm/t/TestZ80asm.pm \
 		${WRKSRC}/src/z80asm/t/objfile.t \
 		${WRKSRC}/src/z80asm/t/test_enigma.t \
 		${WRKSRC}/src/z80asm/t/test_utils.pl \
 		${WRKSRC}/src/z80asm/t/testlib.pl \
 		${WRKSRC}/src/zobjcopy/t/test.t
 	@${REINPLACE_CMD} -e '/\/bin\//s,bash,sh,' \
 		${WRKSRC}/src/common/t/run_tests.sh
 
 pre-build:
 	${LN} -sf z88dk/bin ${BINARY_LINKDIR}
 
 post-install:
 	@${RM} -r ${INSTALL_WRKSRC}/include/_DEVELOPMENT
-	@${RM} -r ${INSTALL_WRKSRC}/libsrc/_DEVELOPMENT
-	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "lib include" \
+	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "include lib" \
 		${STAGEDIR}${DATADIR}
 	@${RMDIR} ${STAGEDIR}${DATADIR}/src
 
 .include <bsd.port.mk>