diff --git a/misc/py-optuna/Makefile b/misc/py-optuna/Makefile
index e4e37980ad08..5f04910d845d 100644
--- a/misc/py-optuna/Makefile
+++ b/misc/py-optuna/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	optuna
-DISTVERSION=	3.6.1
-PORTREVISION=	1
+DISTVERSION=	4.0.0
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Hyperparameter optimization framework
 WWW=		https://optuna.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=1.5.0:databases/py-alembic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.0:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}moto>=0:devel/py-moto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>=0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.9.2:science/py-scipy@${PY_FLAVOR}
 		# tests also depend on Kaleido but it isn't clear how to build it
 
 USES=		python
-USE_PYTHON=	pep517 concurrent autoplist pytest
+USE_PYTHON=	pep517 concurrent autoplist pytest # 2 tests fail, see https://github.com/optuna/optuna/issues/5658
 
 NO_ARCH=	yes
 
+TEST_ENV=	${MAKE_ENV} PATH=${STAGEDIR}${PREFIX}/bin:${PATH} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
 .include <bsd.port.mk>
diff --git a/misc/py-optuna/distinfo b/misc/py-optuna/distinfo
index ad21e8f1a05b..d6ae50a12663 100644
--- a/misc/py-optuna/distinfo
+++ b/misc/py-optuna/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719076429
-SHA256 (optuna-3.6.1.tar.gz) = 146e530b57b4b9afd7526b3e642fbe65491f7e292b405913355f8e438e361ecf
-SIZE (optuna-3.6.1.tar.gz) = 292748
+TIMESTAMP = 1725348294
+SHA256 (optuna-4.0.0.tar.gz) = 844949f09e2a7353ab414e9cfd783cf0a647a65fc32a7236212ed6a37fe08973
+SIZE (optuna-4.0.0.tar.gz) = 280224