diff --git a/devel/py-testpath/Makefile b/devel/py-testpath/Makefile
index b73672eb884f..3d341e54aeb0 100644
--- a/devel/py-testpath/Makefile
+++ b/devel/py-testpath/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	testpath
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Test utilities for Python code working with files and commands
 WWW=		https://github.com/jupyter/testpath
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.2.0<4:devel/py-flit-core@${PY_FLAVOR}
+
 USES=		python
-USE_PYTHON=	autoplist distutils pytest
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
-post-patch:
-	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
-
 .include <bsd.port.mk>
diff --git a/devel/py-testpath/files/setup.py b/devel/py-testpath/files/setup.py
deleted file mode 100644
index b7ed5d66b73c..000000000000
--- a/devel/py-testpath/files/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# setup.py generated by flit for tools that don't yet use PEP 517
-
-from distutils.core import setup
-
-packages = \
-['testpath']
-
-package_data = \
-{'': ['*']}
-
-extras_require = \
-{'test': ['pytest']}
-
-setup(name='testpath',
-      version='%%PORTVERSION%%',
-      description='Test utilities for code working with files and commands',
-      author=None,
-      author_email='Jupyter Development Team <jupyter@googlegroups.com>',
-      url=None,
-      packages=packages,
-      package_data=package_data,
-      extras_require=extras_require,
-      python_requires='>= 3.5',
-     )