diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile
index 2390c0c16843..0932a1e555a3 100644
--- a/net-mgmt/py-napalm/Makefile
+++ b/net-mgmt/py-napalm/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	napalm
-DISTVERSION=	3.2.0
+DISTVERSION=	3.3.1
 CATEGORIES=	net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Net Automation and Progr. Abstraction Layer with Multivendor support
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.2.1:net-mgmt/py-junos-eznc@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ncclient>0:net-mgmt/py-ncclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netmiko>=3.1.0:security/py-netmiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.6.0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyeapi>=0.8.2:net-mgmt/py-pyeapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.11.3:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ciscoconfparse>0:net-mgmt/py-ciscoconfparse@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.6.4:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ddt>=1.2.0:devel/py-ddt@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	napalm-automation
 
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-napalm/distinfo b/net-mgmt/py-napalm/distinfo
index 1bc2ccac9621..fc57ab873fa1 100644
--- a/net-mgmt/py-napalm/distinfo
+++ b/net-mgmt/py-napalm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604489603
-SHA256 (napalm-automation-napalm-3.2.0_GH0.tar.gz) = 7901fe3a1dfba710f90f7d979dc7f3b02d1e5a9ea5d419495cc5a89daafd3e23
-SIZE (napalm-automation-napalm-3.2.0_GH0.tar.gz) = 1216428
+TIMESTAMP = 1625493562
+SHA256 (napalm-automation-napalm-3.3.1_GH0.tar.gz) = 6e1f5897e2007b27c0c137e93be822c8193357fe7f5416d64eb751175a9ffdb9
+SIZE (napalm-automation-napalm-3.3.1_GH0.tar.gz) = 1535740