Index: head/devel/py-tox/Makefile
===================================================================
--- head/devel/py-tox/Makefile	(revision 400447)
+++ head/devel/py-tox/Makefile	(revision 400448)
@@ -1,37 +1,41 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tox
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Python virtualenv-based automation of test activities
+COMMENT=	Virtualenv-based automation of test activities
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:${PORTSDIR}/devel/py-py
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:${PORTSDIR}/devel/py-py \
+		${PYTHON_PKGNAMEPREFIX}pluggy>0:${PORTSDIR}/devel/py-pluggy
 
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:${PORTSDIR}/devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-timeout
+
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	PYTEST
 PYTEST_DESC=	Include the pytest test runner
 
 PYTEST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != 2.7 && ${PYTHON_VER} < 3.2
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
 .endif
 
-regression-test: build
+do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
Index: head/devel/py-tox/distinfo
===================================================================
--- head/devel/py-tox/distinfo	(revision 400447)
+++ head/devel/py-tox/distinfo	(revision 400448)
@@ -1,2 +1,2 @@
-SHA256 (tox-1.7.2.tar.gz) = 267fc86871ae2a398d3e7b4b03e8113b3305533c72ef8de616cbc7258039f1f8
-SIZE (tox-1.7.2.tar.gz) = 84875
+SHA256 (tox-2.1.1.tar.gz) = a03aa022a1f6f82cc21732af0ed48217a3c16873b98e16be22baa7cea74e1eef
+SIZE (tox-2.1.1.tar.gz) = 102170