diff --git a/devel/aws-sdk-cpp/Makefile b/devel/aws-sdk-cpp/Makefile
index d47b1444153e..3db24786ab96 100644
--- a/devel/aws-sdk-cpp/Makefile
+++ b/devel/aws-sdk-cpp/Makefile
@@ -1,67 +1,70 @@
 PORTNAME=	aws-sdk-cpp
-DISTVERSION=	1.11.627
+DISTVERSION=	1.11.642
 CATEGORIES=	devel
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	C++ interface for Amazon Web Services (AWS)
 WWW=		https://github.com/aws/aws-sdk-cpp
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libaws-c-auth.so:security/aws-c-auth \
 		libaws-c-cal.so:security/aws-c-cal \
 		libaws-c-common.so:devel/aws-c-common \
 		libaws-c-compression.so:devel/aws-c-compression \
 		libaws-c-event-stream.so:devel/aws-c-event-stream \
 		libaws-c-http.so:devel/aws-c-http \
 		libaws-c-io.so:devel/aws-c-io \
 		libaws-c-mqtt.so:devel/aws-c-mqtt \
 		libaws-c-s3.so:devel/aws-c-s3 \
 		libaws-c-sdkutils.so:devel/aws-c-sdkutils \
 		libaws-checksums.so:devel/aws-checksums \
 		libaws-crt-cpp.so:devel/aws-crt-cpp \
 		libcurl.so:ftp/curl \
 		libpulse.so:audio/pulseaudio \
 		libs2n.so:security/s2n-tls
 
-USES=		cmake localbase:ldflags pkgconfig ssl
+USES=		cmake:testing localbase:ldflags pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_ONLY="${BUILD_ONLY}"
 CMAKE_ON=	BUILD_SHARED_LIBS
-CMAKE_OFF=	BUILD_DEPS
+CMAKE_OFF=	BUILD_DEPS ENABLE_TESTING AUTORUN_UNIT_TESTS
+CMAKE_TESTING_ON=	ENABLE_TESTING
+CMAKE_TESTING_TARGET=	# No internal target for running tests. Run via post-test.
 
 BUILD_ONLY?=
 
-OPTIONS_DEFINE=	TEST
-OPTIONS_SUB=	yes
-
-TEST_CMAKE_BOOL=	ENABLE_TESTING
-
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can build only the clients you need by defining the option BUILD_ONLY."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Example:"
 	@${ECHO_MSG} "make BUILD_ONLY=\"s3;ec2;route53\""
 	@${ECHO_MSG}
 	@${ECHO_MSG} "For more information check the file ${WRKSRC}/Docs/CMake_Parameters.md"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If this option is not used, the package will be built with support for all the clients."
 	@${ECHO_MSG}
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/pkgconfig,/../libdata/pkgconfig,g" \
 		${WRKSRC}/src/aws-cpp-sdk-core/CMakeLists.txt \
 		${WRKSRC}/cmake/utilities.cmake
 	${REINPLACE_CMD} -e 's,"-Werror",,g' \
 		${WRKSRC}/cmake/compiler_settings.cmake
 
 post-install:
 	@cd ${STAGEDIR}/${LOCALBASE} && \
 	${FIND} -s -d * -type f > ${TMPPLIST}
 
+post-test:
+	for test_binary in ${BUILD_WRKSRC}/generated/tests/*/*-gen-tests; do \
+			echo "Running $$(basename $${test_binary})..."; \
+			$$test_binary --gtest_brief=1; \
+	done
+
 .include <bsd.port.mk>
diff --git a/devel/aws-sdk-cpp/distinfo b/devel/aws-sdk-cpp/distinfo
index cb65ab8809e9..1f16c5c5edac 100644
--- a/devel/aws-sdk-cpp/distinfo
+++ b/devel/aws-sdk-cpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755216801
-SHA256 (aws-aws-sdk-cpp-1.11.627_GH0.tar.gz) = 3cf17596e4131da77fd0ac2aa6f9e7e24c078ab9c1ce9c4afc3c503b616bd67c
-SIZE (aws-aws-sdk-cpp-1.11.627_GH0.tar.gz) = 77158815
+TIMESTAMP = 1757252707
+SHA256 (aws-aws-sdk-cpp-1.11.642_GH0.tar.gz) = d1dbb962625e334253d2f08f9a2d2ed658135f5486903a64ec086c49d158dac3
+SIZE (aws-aws-sdk-cpp-1.11.642_GH0.tar.gz) = 76933553