diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 1fa1cfa4e723..e44ec40eea2c 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	watchdog
-PORTVERSION=	0.10.6
+PORTVERSION=	2.1.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -9,12 +9,9 @@ COMMENT=	Python API library to monitor file system events
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
@@ -25,10 +22,11 @@ NO_ARCH=	yes
 
 PORTDOCS=	*
 
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 
 post-build-DOCS-on:
 	(cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html)
@@ -39,6 +37,6 @@ post-install-DOCS-on:
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo")
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests
 
 .include <bsd.port.mk>
diff --git a/devel/py-watchdog/distinfo b/devel/py-watchdog/distinfo
index 641d928b08f2..cc9103ea8cd8 100644
--- a/devel/py-watchdog/distinfo
+++ b/devel/py-watchdog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612010670
-SHA256 (watchdog-0.10.6.tar.gz) = 1e1ea6d3d74feca5c62393525107aa45c5d4cd15199e2a5f62b1a6ca83679131
-SIZE (watchdog-0.10.6.tar.gz) = 99949
+TIMESTAMP = 1633252004
+SHA256 (watchdog-2.1.6.tar.gz) = a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7
+SIZE (watchdog-2.1.6.tar.gz) = 107292