diff --git a/devel/py-pygobject/Makefile b/devel/py-pygobject/Makefile
index 7ac838223d7b..d83c976cf3fc 100644
--- a/devel/py-pygobject/Makefile
+++ b/devel/py-pygobject/Makefile
@@ -1,44 +1,66 @@
 PORTNAME=	pygobject
-DISTVERSION=	3.50.2
+DISTVERSION=	3.54.5
 PORTREVISION?=	0
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME
 PKGNAMEPREFIX?=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT?=	Python bindings for GObject Introspection
 WWW=		https://pygobject.gnome.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.16:graphics/py-cairo@${PY_FLAVOR}
 LIB_DEPENDS=	libffi.so:devel/libffi
 
 USES=		gnome pkgconfig python
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PORTSCOUT=	limitw:1,even
 
 SLAVE_PORT?=	no
 
 .if ${SLAVE_PORT} == common
 USES+=		meson
 USE_GNOME=	glib20:build introspection:build
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/_build/pygobject-3.0.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0
 	${INSTALL_DATA} ${WRKSRC}/gi/pygobject.h \
 		${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
 .else
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}meson-python>=0.12.1:devel/meson-python@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.16:graphics/py-cairo@${PY_FLAVOR} \
 		${LOCALBASE}/libdata/pkgconfig/pygobject-3.0.pc:devel/pygobject-common
 USE_GNOME=	cairo glib20 introspection
 USE_PYTHON=	autoplist concurrent pep517
+
+OPTIONS_DEFINE=	TEST
+
+TEST_TEST_DEPENDS=	bash:shells/bash
+TEST_USE=	python=pytest
+# PYTEST_BROKEN_TESTS may have infinite loops
+# test_subprocess_communicate_stdout has caused kernel panics
+TEST_VARS=	PEP517_BUILD_CONFIG_SETTING="-Csetup-args=-Dtests=true -Cbuild-dir=_build" \
+		TEST_ARGS=--import-mode=importlib \
+		PYTEST_BROKEN_TESTS="test_pytest_capture_error_in_closure test_sigint test_finalize test_idle_data test_idle_method_callback_no_data test_idle_method_callback_with_data test_idle_multidata test_idle_no_data" \
+		PYTEST_IGNORED_TESTS=test_subprocess_communicate_stdout
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|setuptools<74|setuptools|' \
+		${WRKSRC}/pyproject.toml
+
+post-patch-TEST-on:
+	@${REINPLACE_CMD} -e 's|"-Dtests=false", ||' \
+		${WRKSRC}/pyproject.toml
+
+pre-test-TEST-on:
+	${CP} -a ${WRKSRC}/_build/ ${WRKSRC}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-pygobject/distinfo b/devel/py-pygobject/distinfo
index 7e89d9e5d790..1748446eec0c 100644
--- a/devel/py-pygobject/distinfo
+++ b/devel/py-pygobject/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761489022
-SHA256 (gnome/pygobject-3.50.2.tar.gz) = ece6b860aab77cb649fdfc6e88d8a83765e7a62f7ffd39a628d6e2a0d397a7ff
-SIZE (gnome/pygobject-3.50.2.tar.gz) = 1085854
+TIMESTAMP = 1764628744
+SHA256 (gnome/pygobject-3.54.5.tar.gz) = b6656f6348f5245606cf15ea48c384c7f05156c75ead206c1b246c80a22fb585
+SIZE (gnome/pygobject-3.54.5.tar.gz) = 1274658
diff --git a/devel/pygobject-common/Makefile b/devel/pygobject-common/Makefile
index 34f82088547c..af7c65aabebd 100644
--- a/devel/pygobject-common/Makefile
+++ b/devel/pygobject-common/Makefile
@@ -1,22 +1,16 @@
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-common
 
 COMMENT=	Common files for Python bindings for GObject Introspection
 
-TEST_DEPENDS=	bash:shells/bash \
-		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
-
 NO_BUILD=	yes
+NO_TEST=	yes
 NO_ARCH=	yes
 PLIST_FILES=	include/pygobject-3.0/pygobject.h \
 		libdata/pkgconfig/pygobject-3.0.pc
 
-# tests/test_glib.py is flaky - its tests fail when run together, but pass when
-# executed separately
-TEST_ENV=	PYTEST_ADDOPTS='-k "not test_io_add_watch and not test_main_loop"'
-
 SLAVE_PORT=	common
 
 MASTERDIR=	${.CURDIR}/../../devel/py-pygobject
 
 .include "${MASTERDIR}/Makefile"