diff --git a/www/py-freenit/Makefile b/www/py-freenit/Makefile
index 83ce58cf95e6..836c7f4414e5 100644
--- a/www/py-freenit/Makefile
+++ b/www/py-freenit/Makefile
@@ -1,33 +1,37 @@
 PORTNAME=	freenit
-PORTVERSION=	0.2.21
+DISTVERSION=	0.2.23
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
 COMMENT=	REST API framework based on Flask-Smorest
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=0:databases/py-alembic@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fastapi-users-db-ormar>=0:databases/py-fastapi-users-db-ormar@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fastapi>=0:www/py-fastapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvicorn>=0:www/py-uvicorn@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-factoryboy>=0:devel/py-pytest-factoryboy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-factoryboy>=0:devel/py-pytest-factoryboy@${PY_FLAVOR}
 
 USES=		python:3.8+
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent distutils pytest
 USE_RC_SUBR=	freenit
-SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
 TEST_ENV=	PYTHONPATH=${WRKSRC}/src
-
 NO_ARCH=	yes
+SUB_LIST=	PYTHON_VER=${PYTHON_VER}
+
+OPTIONS_DEFINE=		ORMAR
+OPTIONS_DEFAULT=	ORMAR
+
+ORMAR_DESC=		Support for SQL databases using Ormar
+ORMAR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=0:databases/py-alembic@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}ormar>0:databases/py-ormar@${PY_FLAVOR}
 
-# Requires newer pytest
-# do-test:
-# 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} FREENIT_ENV=test ${PYTHON_CMD} -m pytest --ignore=freenit/project/ -v -rs -o addopts=
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} FREENIT_ENV=test ${PYTHON_CMD} -m pytest --ignore=freenit/project/ -v -rs -o addopts=
 
 .include <bsd.port.mk>
diff --git a/www/py-freenit/distinfo b/www/py-freenit/distinfo
index 5b79a5254440..0cb5af878b98 100644
--- a/www/py-freenit/distinfo
+++ b/www/py-freenit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645308453
-SHA256 (freenit-0.2.21.tar.gz) = 8c0ea28bced01ae7d8772b7c794a2e5549179261427f86ae1966375fd897fedb
-SIZE (freenit-0.2.21.tar.gz) = 18353
+TIMESTAMP = 1653394612
+SHA256 (freenit-0.2.23.tar.gz) = 008b069f824315f82cb26cfe60bfb339d8867372dc0f22f0fb4de530278db8d0
+SIZE (freenit-0.2.23.tar.gz) = 19675