Index: projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile
===================================================================
--- projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile	(revision 345749)
+++ projects/kyua-use-googletest-test-interface/lib/googletest/gmock/tests/Makefile	(revision 345750)
@@ -1,14 +1,19 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test
 
 GTESTS+=	gmock_stress_test
 
 LIBADD+=	pthread gtest gmock
 
+# This test cannot selectively run a single test, as it verifies results when
+# `--gtest_list_tests` is run:
+# https://github.com/google/googletest/issues/2204
+TEST_INTERFACE.gmock_stress_test=	plain
+
 # The next release will resolve a number of build warnings issues.
 NO_WERROR=
 
 .include <bsd.test.mk>
Index: projects/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile
===================================================================
--- projects/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile	(revision 345749)
+++ projects/kyua-use-googletest-test-interface/lib/googletest/gtest/tests/Makefile	(revision 345750)
@@ -1,46 +1,57 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test
 
 GTESTS+=	gtest_environment_test
 GTESTS+=	gtest_no_test_unittest
 GTESTS+=	googletest-param-test-test
 GTESTS+=	gtest_premature_exit_test
 GTESTS+=	gtest_repeat_test
 GTESTS+=	gtest_stress_test
 GTESTS+=	gtest_throw_on_failure_ex_test
 GTESTS+=	gtest-unittest-api_test
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
 .for death_test in gtest-death-test_ex_catch_test gtest-death-test_ex_nocatch_test
 # XXX: copying source files in order to tweak CXXFLAGS seems hacky.
 ${death_test}.cc: googletest-death-test_ex_test.cc
 	${CP} ${.ALLSRC} ${.TARGET}
 CLEANFILES+=	${death_test}.cc
 CXXFLAGS.${death_test}+= -fexception
 .endfor
 
 CXXFLAGS.gtest-death-test_ex_catch_test+=	\
 	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=1
 
 CXXFLAGS.gtest-death-test_ex_nocatch_test+=     \
 	-DGTEST_ENABLE_CATCH_EXCEPTIONS_=0
 
 SRCS.googletest-param-test-test=	\
 	googletest-param-test-test.cc	\
 	googletest-param-test2-test.cc
 
 LIBADD+=	gtest
 
+# These tests confuse the kyua googletest engine, as they don't conform to the
+# googletest spec; they're functional unit tests for the library.
+TEST_INTERFACE.gtest_environment_test= plain
+TEST_INTERFACE.gtest_no_test_unittest= plain
+TEST_INTERFACE.gtest_repeat_test= plain
+TEST_INTERFACE.gtest_stress_test= plain
+TEST_INTERFACE.gtest_throw_on_failure_ex_test= plain
+# This test program cannot selectively run test suites/testcases:
+# https://github.com/google/googletest/issues/2205
+TEST_INTERFACE.gtest-unittest-api_test= plain
+
 # XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be
 #      handling this.
 LIBADD.gtest_stress_test+=	pthread
 
 # The next release will resolve a number of build warnings issues.
 NO_WERROR=
 
 .include <bsd.test.mk>
Index: projects/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile
===================================================================
--- projects/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile	(revision 345749)
+++ projects/kyua-use-googletest-test-interface/lib/googletest/gtest_main/tests/Makefile	(revision 345750)
@@ -1,43 +1,48 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test
 
 GTESTS+=	googletest-death-test-test
 GTESTS+=	googletest-filepath-test
 GTESTS+=	googletest-linked-ptr-test
 GTESTS+=	googletest-listener-test
 GTESTS+=	gtest_main_unittest
 GTESTS+=	googletest-message-test
 GTESTS+=	googletest-options-test
 GTESTS+=	googletest-port-test
 GTESTS+=	gtest_pred_impl_unittest
 GTESTS+=	googletest-printers-test
 GTESTS+=	gtest_prod_test
 GTESTS+=	gtest_sole_header_test
 GTESTS+=	googletest-test-part-test
 GTESTS+=	gtest-typed-test_test
 GTESTS+=	gtest_skip_test
 GTESTS+=	gtest_unittest
 
+# This test cannot selectively run a single test, as it verifies results when
+# `--gtest_list_tests` is run:
+# https://github.com/google/googletest/issues/2204
+TEST_INTERFACE.googletest-listener-test=	plain
+
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
 SRCS.gtest-typed-test_test=		\
 	gtest-typed-test_test.cc	\
 	gtest-typed-test2_test.cc
 
 SRCS.gtest_prod_test=			\
 	gtest_prod_test.cc		\
 	production.cc
 
 LIBADD+=	gtest gtest_main
 
 LIBADD.googletest-port-test+=	pthread
 LIBADD.gtest_unittest+=		pthread
 
 # The next release will resolve a number of build warnings issues.
 NO_WERROR=
 
 .include <bsd.test.mk>