diff --git a/audio/libmysofa/Makefile b/audio/libmysofa/Makefile
index 0ca80667c266..716b11100250 100644
--- a/audio/libmysofa/Makefile
+++ b/audio/libmysofa/Makefile
@@ -1,40 +1,47 @@
 PORTNAME=	libmysofa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.2
 CATEGORIES=	audio
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	SOFA (Spatially Oriented Format for Acoustics) file reader
 WWW=		https://github.com/hoene/libmysofa
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	node:www/node
 
 USES=		cmake cpe pathfix
-USE_LDCONFIG=	yes
-
 CPE_VENDOR=	symonics
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	hoene
+USE_LDCONFIG=	yes
+
+EXTRACT_AFTER_ARGS=	--exclude ${PORTNAME}-${DISTVERSION}/tests \
+			--exclude ${PORTNAME}-${DISTVERSION}/windows \
+			--no-same-owner --no-same-permissions
 
 OPTIONS_DEFINE=		STATIC TEST
 OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=		yes
 
 STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS
 
 TEST_BUILD_DEPENDS=	cunit>0:devel/cunit
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_TEST_TARGET=	test
+TEST_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-tests_compare.sh \
+			${PATCHDIR}/extrapatch-tests_compareIgnoreNew.sh
 
 # The tests are expected to be in ../tests relative to the build
 # directory and the build results are expected to be in build/ relative
 # to ${WRKSRC}.  USES=cmake does not allow overwriting ${WRKDIR}/.build
 # as the build directory.
-post-patch:
+post-extract-TEST-on:
+	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
+	    -C ${WRKDIR} --include ${PORTNAME}-${DISTVERSION}/tests \
+	    --no-same-owner --no-same-permissions
 	@${RLN} ${WRKSRC}/build ${CONFIGURE_WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/audio/libmysofa/files/patch-tests_compare.sh b/audio/libmysofa/files/extrapatch-tests_compare.sh
similarity index 100%
rename from audio/libmysofa/files/patch-tests_compare.sh
rename to audio/libmysofa/files/extrapatch-tests_compare.sh
diff --git a/audio/libmysofa/files/patch-tests_compareIgnoreNew.sh b/audio/libmysofa/files/extrapatch-tests_compareIgnoreNew.sh
similarity index 100%
rename from audio/libmysofa/files/patch-tests_compareIgnoreNew.sh
rename to audio/libmysofa/files/extrapatch-tests_compareIgnoreNew.sh