diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile
index bae8334b2b1d..daca174186f6 100644
--- a/www/py-pyjwt/Makefile
+++ b/www/py-pyjwt/Makefile
@@ -1,36 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	pyjwt
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.7.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyJWT-${PORTVERSION}
 
 MAINTAINER=	terje@elde.net
 COMMENT=	JSON Web Token implementation in Python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Some tests are skipped without pycrypto, but its not
 # referenced as a requirement anymore.
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 OPTIONS_DEFINE=	RSASSA
 
 RSASSA_DESC=		RSASSA-PKCS1 v1.5 signature support
 RSASSA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
 
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -c /dev/null -v -rs
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
 .include <bsd.port.mk>
diff --git a/www/py-pyjwt/distinfo b/www/py-pyjwt/distinfo
index 76c36ca87302..381402aac2e6 100644
--- a/www/py-pyjwt/distinfo
+++ b/www/py-pyjwt/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PyJWT-1.4.0.tar.gz) = e1b2386cfad541445b1d43e480b02ca37ec57259fd1a23e79415b57ba5d8a694
-SIZE (PyJWT-1.4.0.tar.gz) = 34613
+TIMESTAMP = 1577039206
+SHA256 (PyJWT-1.7.1.tar.gz) = 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96
+SIZE (PyJWT-1.7.1.tar.gz) = 41979
diff --git a/www/py-pyjwt/files/patch-setup.py b/www/py-pyjwt/files/patch-setup.py
deleted file mode 100644
index 3cd7bfd035d6..000000000000
--- a/www/py-pyjwt/files/patch-setup.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- setup.py.orig	2016-02-26 09:43:54 UTC
-+++ setup.py
-@@ -31,8 +31,6 @@ if sys.argv[-1] == 'publish':
- 
- tests_require = [
-     'pytest',
--    'pytest-cov',
--    'pytest-runner',
- ]
- 
- setup(
-@@ -61,7 +59,6 @@ setup(
-         'Topic :: Utilities',
-     ],
-     test_suite='tests',
--    setup_requires=['pytest-runner'],
-     tests_require=tests_require,
-     extras_require=dict(
-         test=tests_require,