diff --git a/devel/py-entrypoints/Makefile b/devel/py-entrypoints/Makefile
index 46169f9a8ce3..1ffe8081e09f 100644
--- a/devel/py-entrypoints/Makefile
+++ b/devel/py-entrypoints/Makefile
@@ -1,22 +1,26 @@
 PORTNAME=	entrypoints
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Discover and load entry points from installed packages
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0,1:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
 NO_ARCH=	yes
 
+post-patch:
+	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
+
 do-test:
-	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYTHON_VER})
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
diff --git a/devel/py-entrypoints/distinfo b/devel/py-entrypoints/distinfo
index a2acefe719a6..a0ef024a8386 100644
--- a/devel/py-entrypoints/distinfo
+++ b/devel/py-entrypoints/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549038683
-SHA256 (entrypoints-0.3.tar.gz) = c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451
-SIZE (entrypoints-0.3.tar.gz) = 12315
+TIMESTAMP = 1650970323
+SHA256 (entrypoints-0.4.tar.gz) = b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4
+SIZE (entrypoints-0.4.tar.gz) = 13974
diff --git a/devel/py-entrypoints/files/setup.py b/devel/py-entrypoints/files/setup.py
new file mode 100644
index 000000000000..ff77668cf787
--- /dev/null
+++ b/devel/py-entrypoints/files/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+# setup.py generated by flit for tools that don't yet use PEP 517
+
+from distutils.core import setup
+
+setup(name='entrypoints',
+      version='%%PORTVERSION%%',
+      description='Discover and load entry points from installed packages.',
+      author='Thomas Kluyver',
+      author_email='thomas@kluyver.me.uk',
+      url='https://github.com/takluyver/entrypoints',
+      py_modules=['entrypoints'],
+      python_requires='>=3.6',
+     )