Index: head/net/py-amqp/Makefile
===================================================================
--- head/net/py-amqp/Makefile	(revision 565311)
+++ head/net/py-amqp/Makefile	(revision 565312)
@@ -1,29 +1,32 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	amqp
-PORTVERSION=	2.5.2
+PORTVERSION=	2.6.1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Low-level AMQP client for Python (fork of amqplib)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vine>=1.1.3<5.0.0a1:devel/py-vine@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}case>0:devel/py-case@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC}/funtests && ${SETENV} PYTHONPATH=../ ${PYTHON_CMD} run_all.py
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts= \
+		-k 'not test_rmq'
 
 .include <bsd.port.mk>
Index: head/net/py-amqp/distinfo
===================================================================
--- head/net/py-amqp/distinfo	(revision 565311)
+++ head/net/py-amqp/distinfo	(revision 565312)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576935968
-SHA256 (amqp-2.5.2.tar.gz) = 77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d
-SIZE (amqp-2.5.2.tar.gz) = 117788
+TIMESTAMP = 1605183368
+SHA256 (amqp-2.6.1.tar.gz) = 70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21
+SIZE (amqp-2.6.1.tar.gz) = 119956