diff --git a/lib/googletest/Makefile b/lib/googletest/Makefile
index 551d0387e301..b45985177f83 100644
--- a/lib/googletest/Makefile
+++ b/lib/googletest/Makefile
@@ -1,10 +1,14 @@
 # $FreeBSD$
 
-SUBDIR+=	gtest
-SUBDIR+=	.WAIT
-SUBDIR+=	gmock
-SUBDIR+=	.WAIT
-SUBDIR+=	gmock_main
-SUBDIR+=	gtest_main
+.include <src.opts.mk>
+
+SUBDIR+=		gtest
+SUBDIR+=		.WAIT
+SUBDIR+=		gmock
+SUBDIR+=		.WAIT
+SUBDIR+=		gmock_main
+SUBDIR+=		gtest_main
+
+SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.subdir.mk>
diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile
new file mode 100644
index 000000000000..3b3078f8612a
--- /dev/null
+++ b/lib/googletest/tests/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.PATH:		${SRCTOP}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>