diff --git a/sysutils/fusefs-unionfs/Makefile b/sysutils/fusefs-unionfs/Makefile
index 093c1906b3c3..dbd665720f00 100644
--- a/sysutils/fusefs-unionfs/Makefile
+++ b/sysutils/fusefs-unionfs/Makefile
@@ -1,33 +1,39 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 
 PORTNAME=	unionfs
-PORTVERSION=	2.0
 DISTVERSIONPREFIX=	v
+DISTVERSION=	2.2
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	FUSE based implementation of the well-known unionfs
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+
+USES=		cmake fuse localbase:ldflags python:test
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	rpodgorny
 GH_PROJECT=	unionfs-fuse
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/unionfs \
 		bin/unionfsctl \
 		man/man8/unionfs.8.gz
 
-USES=		fuse cmake localbase:ldflags
-
-post-patch:
-	@${REINPLACE_CMD} "s,share/man,man,g" ${WRKSRC}/man/CMakeLists.txt
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
+pre-test:
+	${RLN} ${BUILD_WRKSRC}/src/unionfs ${WRKSRC}/src/unionfs
+	${RLN} ${BUILD_WRKSRC}/src/unionfsctl ${WRKSRC}/src/unionfsctl
+
+do-test:
+	cd ${WRKSRC} && ${SETNEV} ${MAKE_ENV} ${PYTHON_CMD} -m pytest -k test_help --verbose
+
 .include <bsd.port.mk>
diff --git a/sysutils/fusefs-unionfs/distinfo b/sysutils/fusefs-unionfs/distinfo
index 982115198e00..de0face115d1 100644
--- a/sysutils/fusefs-unionfs/distinfo
+++ b/sysutils/fusefs-unionfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533965149
-SHA256 (rpodgorny-unionfs-fuse-v2.0_GH0.tar.gz) = f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643
-SIZE (rpodgorny-unionfs-fuse-v2.0_GH0.tar.gz) = 46537
+TIMESTAMP = 1635114774
+SHA256 (rpodgorny-unionfs-fuse-v2.2_GH0.tar.gz) = 248a0fee9979146b79b05fc728621869da5936c1f43a27e36e7515b301817e43
+SIZE (rpodgorny-unionfs-fuse-v2.2_GH0.tar.gz) = 47955