diff --git a/devel/benchmark/Makefile b/devel/benchmark/Makefile
index bd8de2993ce6..7271de8800b5 100644
--- a/devel/benchmark/Makefile
+++ b/devel/benchmark/Makefile
@@ -1,32 +1,29 @@
 PORTNAME=	benchmark
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Microbenchmark support library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang
+USES=		cmake:testing compiler:c++11-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
+GH_TUPLE=	google:googletest:release-1.12.1:googletest # requires googletest sources for some reason, see https://github.com/google/benchmark/issues/979
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BENCHMARK_ENABLE_TESTING
+CMAKE_TESTING_ON=	BENCHMARK_ENABLE_TESTING # BENCHMARK_DOWNLOAD_DEPENDENCIES
+CMAKE_TESTING_ARGS=	-DGOOGLETEST_PATH=${WRKSRC_googletest}
 
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_gcc=	-Wno-stringop-truncation
 
 BINARY_ALIAS=	git=false
 
-do-test: # Broken: https://github.com/google/benchmark/issues/979
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBENCHMARK_ENABLE_TESTING=ON -DGOOGLETEST_PATH=${LOCALBASE} ${CMAKE_SOURCE_PATH} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
-
 .include <bsd.port.mk>
diff --git a/devel/benchmark/distinfo b/devel/benchmark/distinfo
index 1036a5eaf053..bcf7401238d8 100644
--- a/devel/benchmark/distinfo
+++ b/devel/benchmark/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1659545523
+TIMESTAMP = 1660073282
 SHA256 (google-benchmark-v1.7.0_GH0.tar.gz) = 3aff99169fa8bdee356eaa1f691e835a6e57b1efeadb8a0f9f228531158246ac
 SIZE (google-benchmark-v1.7.0_GH0.tar.gz) = 194165
+SHA256 (google-googletest-release-1.12.1_GH0.tar.gz) = 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2
+SIZE (google-googletest-release-1.12.1_GH0.tar.gz) = 854944