diff --git a/devel/py-testrepository/Makefile b/devel/py-testrepository/Makefile
index f1c2ea38f224..428a575eab6c 100644
--- a/devel/py-testrepository/Makefile
+++ b/devel/py-testrepository/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	testrepository
-DISTVERSION=	0.0.20
-PORTREVISION=	1
+DISTVERSION=	0.0.21
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Repository of test results
 WWW=		https://launchpad.net/testrepository
 
 LICENSE=	APACHE20 BSD3CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=		${WRKSRC}/Apache-2.0
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/BSD
 
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fixtures>0:devel/py-fixtures@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-subunit>=0.0.18:devel/py-python-subunit@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}testtools>=0.9.30:devel/py-testtools@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-subunit>=1.0.0:devel/py-python-subunit@${PY_FLAVOR}
 
-USES=		python shebangfix
-USE_PYTHON=	distutils concurrent autoplist
-SHEBANG_FILES=	testr
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-testrepository/distinfo b/devel/py-testrepository/distinfo
index 712cc6910265..552e8288155c 100644
--- a/devel/py-testrepository/distinfo
+++ b/devel/py-testrepository/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527335603
-SHA256 (testrepository-0.0.20.tar.gz) = 752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb
-SIZE (testrepository-0.0.20.tar.gz) = 84956
+TIMESTAMP = 1728718529
+SHA256 (testrepository-0.0.21.tar.gz) = 368afcf7e090b3c688bdd754a25f64bc314e512b816f8c71b9f9fc17dc37a3d9
+SIZE (testrepository-0.0.21.tar.gz) = 2416956