Index: devel/googlemock/Makefile
===================================================================
--- devel/googlemock/Makefile	(revision 398150)
+++ devel/googlemock/Makefile	(working copy)
@@ -23,16 +23,15 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
+# fused-src tests are only useful for bundling, testing them before
+# installing system version is pointless. *.py aren't used during
+# build/test, so fixing shebang is mainly to help hacking.
+CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
 python_OLD_CMD=	/usr/bin/env python
 python_CMD=	/usr/bin/env python2
 SHEBANG_FILES=	scripts/fuse_gmock_files.py scripts/gmock_doctor.py
+TEST_TARGET=	check
 
-OPTIONS_DEFINE=	TEST
-
-TEST_USES=	python:2,build
-TEST_ALL_TARGET=check
-
 post-patch:
 	${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
 # enable vendor make install again (revert 52277c9)
Index: devel/googletest/Makefile
===================================================================
--- devel/googletest/Makefile	(revision 398150)
+++ devel/googletest/Makefile	(working copy)
@@ -19,20 +19,19 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
+# fused-src tests are only useful for bundling, testing them before
+# installing system version is pointless. *.py aren't used during
+# build/test, so fixing shebang is mainly to help hacking.
+CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
 python_OLD_CMD=	/usr/bin/env python
 python_CMD=	/usr/bin/env python2
 SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
 		scripts/pump.py
+TEST_TARGET=	check
 
-OPTIONS_DEFINE=	TEST
-
-TEST_USES=	python:2,build
-TEST_ALL_TARGET=check
-
 post-patch:
 # enable vendor make install again (revert 661758e)
-	${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
+	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
 		${WRKSRC}/Makefile.am
 
 post-install: