diff --git a/biology/locarna/Makefile b/biology/locarna/Makefile
index 6c6c008b2384..4483c3792d59 100644
--- a/biology/locarna/Makefile
+++ b/biology/locarna/Makefile
@@ -1,28 +1,36 @@
 PORTNAME=	locarna
 DISTVERSION=	2.0.0
 CATEGORIES=	biology
 MASTER_SITES=	https://github.com/s-will/LocARNA/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	LocARNA provides several tools for the structural analysis of RNA
 WWW=		https://github.com/s-will/LocARNA
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libRNA.a:biology/viennarna
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libgsl.so:math/gsl \
 		libmpfr.so:math/mpfr
+TEST_DEPENDS=	bash:shells/bash \
+		catch>0:devel/catch
 
 USES=		autoreconf gmake libtool perl5 pkgconfig shebangfix
 USE_LDCONFIG=	yes
 
-SHEBANG_FILES=	src/Utils/locarna_mcc
+CXXFLAGS+=	-I${LOCALBASE}/include/catch2 # use external catch
+
+SHEBANG_FILES=	src/Utils/locarna_mcc \
+		src/Tests/test_programs
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
-TEST_TARGET=	check # tests fail to compile, see https://github.com/s-will/LocARNA/issues/80
+TEST_TARGET=	check # one test fails, see https://github.com/s-will/LocARNA/issues/81
+
+post-extract: # unbundle catch, see https://github.com/s-will/LocARNA/issues/80
+	@${RM} ${WRKSRC}/src/Tests/catch.hpp
 
 .include <bsd.port.mk>