diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 661735063b7a..13296122dc53 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -1,55 +1,40 @@
 PORTNAME=	xonsh
-DISTVERSION=	0.23.2
-PORTREVISION=	2
+DISTVERSION=	0.23.3
 CATEGORIES=	shells python
-MASTER_SITES=	PYPI
+#MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Python-powered shell
 WWW=		https://xon.sh
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=5.3.1:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyte>=0.8.0:devel/py-pyte@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-subprocess>0:devel/py-pytest-subprocess@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}restructuredtext-lint>0:textproc/py-restructuredtext-lint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=20.16.2:devel/py-virtualenv@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python
+USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent pep517 pytest
-PYTEST_BROKEN_TESTS=	\
-		test_bash_completer.py \
-		test_command_completers.py \
-		test_commands_cache.py \
-		test_dir_completers.py \
-		test_integrations.py \
-		test_man.py \
-		test_os.xsh \
-		test_pipelines.py \
-		test_ptk_highlight.py \
-		test_stress.py \
-		test_specs.py
-SHEBANG_FILES=	tests/bin/cat tests/bin/pwd tests/bin/wc
 
 NO_ARCH=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' \
-		${WRKSRC}/tests/xintegration/test_integrations.py \
-		${WRKSRC}/tests/test_virtualenv_activator.py
+do-test:
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest
 
 .include <bsd.port.mk>
diff --git a/shells/xonsh/distinfo b/shells/xonsh/distinfo
index 23c56a8c279c..1809bb1f6ce3 100644
--- a/shells/xonsh/distinfo
+++ b/shells/xonsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777284433
-SHA256 (xonsh-0.23.2.tar.gz) = 633608c8292938af0f242f05326cc2912f25fa72bd808824ab0534a6df304402
-SIZE (xonsh-0.23.2.tar.gz) = 1030659
+TIMESTAMP = 1777631686
+SHA256 (xonsh-xonsh-0.23.3_GH0.tar.gz) = c888f1c23e5aefa4af5553a202a666ec017b288a2e5f1097529a98398ac821f4
+SIZE (xonsh-xonsh-0.23.3_GH0.tar.gz) = 6177041