diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 41bce154b84d..8ac707180e8e 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -1,57 +1,66 @@
 PORTNAME=	azure-agent
-PORTVERSION=	2.12.0.2
-PORTREVISION=	2
+DISTVERSION=	2.15.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	weh@microsoft.com
 COMMENT=	Microsoft Azure Linux Agent
 WWW=		https://github.com/Azure/WALinuxAgent/
 
+PATCH_SITES=	https://github.com/Azure/WALinuxAgent/commit/
+PATCHFILES=	8669496167f1b41f5d0dceeb15dee3f23cfc5f5d.patch:-p1
+
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash \
 		dmidecode:sysutils/dmidecode \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
 		ca_root_nss>0:security/ca_root_nss
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=4.0.2:devel/py-mock@${PY_FLAVOR} \
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		python shebangfix sudo
 
 SHEBANG_FILES=	bin/waagent bin/waagent2.0
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Azure
 GH_PROJECT=	WALinuxAgent
-USE_PYTHON=	autoplist distutils noflavors
+USE_PYTHON=	autoplist distutils noflavors pytest
+
+BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 		${WRKSRC}/azurelinuxagent/common/osutil/default.py
 	${REINPLACE_CMD} -e "s,/etc/rc.d/waagent,${PREFIX}/etc/rc.d/waagent,g" \
 			 -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 			 -e "s,#!/usr/bin/env python,#!${PYTHON_CMD},g" \
 			 -e "/command_interpreter/ s,/usr/local/bin/python,${PYTHON_CMD}," \
 			 -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \
 		${WRKSRC}/bin/waagent2.0
 	${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \
 			 -e "s,python,${PYTHON_CMD},g" \
 		${WRKSRC}/init/freebsd/waagent
 	${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 			 -e "s,/usr/bin/python,${PYTHON_CMD},g" \
 			 -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent.service
 	${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" \
 			 -e "/set_conf_files.*freebsd\/waagent.conf/ s/^/#/" \
 			 -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/setup.py
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/config/freebsd/waagent.conf \
 		${STAGEDIR}${PREFIX}/etc/waagent.conf.sample
 
+do-test:
+	cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ./ci/pytest.sh
+
+
 .include <bsd.port.mk>
diff --git a/sysutils/azure-agent/distinfo b/sysutils/azure-agent/distinfo
index ea34370637e4..6a7b40e16930 100644
--- a/sysutils/azure-agent/distinfo
+++ b/sysutils/azure-agent/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1733935955
-SHA256 (Azure-WALinuxAgent-v2.12.0.2_GH0.tar.gz) = e7a2507c7815d6ad49227c6dd4259949ae01efbfd8ccd7bf8e79bdf051851fb0
-SIZE (Azure-WALinuxAgent-v2.12.0.2_GH0.tar.gz) = 2144003
+TIMESTAMP = 1777406048
+SHA256 (Azure-WALinuxAgent-v2.15.0.1_GH0.tar.gz) = f405cb90179dbe582a1c71a36af8016072c0defeb969aeee7861d5aab10499d8
+SIZE (Azure-WALinuxAgent-v2.15.0.1_GH0.tar.gz) = 2383770
+SHA256 (8669496167f1b41f5d0dceeb15dee3f23cfc5f5d.patch) = 41ff61239b569c8fb80a65e0f5f39b145f1d49c7c9429c94307ed8d38fb5d9fd
+SIZE (8669496167f1b41f5d0dceeb15dee3f23cfc5f5d.patch) = 1803