diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile
index 8eb9fb99a368..d5a71d3c33a6 100644
--- a/lib/googletest/gmock/Makefile
+++ b/lib/googletest/gmock/Makefile
@@ -42,7 +42,4 @@ INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-generated-actions.h
 
 SRCS+=		gmock-all.cc
 
-HAS_TESTS=
-SUBDIR.${MK_TESTS}+= tests
-
 .include <bsd.lib.mk>
diff --git a/lib/googletest/gmock_main/Makefile b/lib/googletest/gmock_main/Makefile
index a2ecab10d586..238f342d55eb 100644
--- a/lib/googletest/gmock_main/Makefile
+++ b/lib/googletest/gmock_main/Makefile
@@ -19,7 +19,4 @@ LDFLAGS+=	-L${LIBGMOCKDIR}
 
 SRCS+=		gmock_main.cc
 
-HAS_TESTS=
-SUBDIR.${MK_TESTS}+= tests
-
 .include <bsd.lib.mk>
diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile
index 103bf84db5b2..470682faebc1 100644
--- a/lib/googletest/gtest/Makefile
+++ b/lib/googletest/gtest/Makefile
@@ -47,7 +47,4 @@ SRCS+=		gtest-all.cc
 
 LIBADD+=	pthread regex
 
-HAS_TESTS=
-SUBDIR.${MK_TESTS}+= tests
-
 .include <bsd.lib.mk>
diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile
index 1499482d878a..dc102ed8a6e0 100644
--- a/lib/googletest/gtest_main/Makefile
+++ b/lib/googletest/gtest_main/Makefile
@@ -17,7 +17,4 @@ LDFLAGS+=	-L${LIBGTESTDIR}
 
 SRCS+=		gtest_main.cc
 
-HAS_TESTS=
-SUBDIR.${MK_TESTS}+= tests
-
 .include <bsd.lib.mk>
diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile
index 3b3078f8612a..1df9936ff6cf 100644
--- a/lib/googletest/tests/Makefile
+++ b/lib/googletest/tests/Makefile
@@ -3,4 +3,10 @@
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
+# Note: we start the gmock_main and gmock tests first since those take up to
+# 60 seconds to build, so starting them late seriously reduces build parallism.
+SUBDIR=		gmock_main gmock gtest_main gtest
+
+SUBDIR_PARALLEL=
+
 .include <bsd.test.mk>
diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc
new file mode 100644
index 000000000000..3b6b7fc07a9b
--- /dev/null
+++ b/lib/googletest/tests/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
+# Keep the existing tests directory structure (with subdirs per component)
+# rather than installing all of them to /usr/tests/lib/googletest
+TESTSDIR=	${TESTSBASE}/lib/googletest/${.CURDIR:T}
diff --git a/lib/googletest/gmock/tests/Makefile b/lib/googletest/tests/gmock/Makefile
similarity index 100%
rename from lib/googletest/gmock/tests/Makefile
rename to lib/googletest/tests/gmock/Makefile
diff --git a/lib/googletest/gmock_main/tests/Makefile b/lib/googletest/tests/gmock_main/Makefile
similarity index 100%
rename from lib/googletest/gmock_main/tests/Makefile
rename to lib/googletest/tests/gmock_main/Makefile
diff --git a/lib/googletest/gtest/tests/Makefile b/lib/googletest/tests/gtest/Makefile
similarity index 100%
rename from lib/googletest/gtest/tests/Makefile
rename to lib/googletest/tests/gtest/Makefile
diff --git a/lib/googletest/gtest_main/tests/Makefile b/lib/googletest/tests/gtest_main/Makefile
similarity index 100%
rename from lib/googletest/gtest_main/tests/Makefile
rename to lib/googletest/tests/gtest_main/Makefile