diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@@ -1,5 +1,7 @@
 .include <googletest.test.inc.mk>
 
+PACKAGE?=	googletest
+
 GTEST_DIR=	${SRCTOP}/contrib/googletest
 GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock
 GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest
diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile
--- a/lib/googletest/tests/Makefile
+++ b/lib/googletest/tests/Makefile
@@ -1,4 +1,7 @@
 .PATH:		${SRCTOP}/tests
+
+PACKAGE=	tests
+
 KYUAFILE=	yes
 
 # Note: we start the gmock_main and gmock tests first since those take up to
diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc
--- a/lib/googletest/tests/Makefile.inc
+++ b/lib/googletest/tests/Makefile.inc
@@ -3,6 +3,8 @@
 # rather than installing all of them to /usr/tests/lib/googletest
 TESTSDIR=	${TESTSBASE}/lib/googletest/${.CURDIR:T}
 
+PACKAGE=	tests
+
 # Clang's optimizer spends a really long time on these tests at -O2. Changing
 # -O2 to -O1 reduces the -j32 time for lib/googletest/test from 131s to 71s.
 # Using -O0 further reduces the time to 29s, and also reduces the disk usage
diff --git a/release/packages/ucl/tests.ucl b/release/packages/ucl/googletest-all.ucl
copy from release/packages/ucl/tests.ucl
copy to release/packages/ucl/googletest-all.ucl
--- a/release/packages/ucl/tests.ucl
+++ b/release/packages/ucl/googletest-all.ucl
@@ -16,12 +16,18 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+comment = "Unit testing framework"
 
-deps {
-	# Quite a few tests require flua.
-	"flua" {
-		version = "${VERSION}"
-	},
-}
+desc = <<EOD
+Google Test (gtest) is an xUnit-based unit testing framework for C++,
+developed by Google LLC.
 
+This version of Google Test is provided for use by unit tests in the
+base system, and is not intended for third-party users.  A supported
+version of Google Test may be found in the FreeBSD Ports Collection
+as devel/googletest.
+EOD
 
+annotations {
+	set = "optional,optional-jail"
+}
diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl
--- a/release/packages/ucl/tests-all.ucl
+++ b/release/packages/ucl/tests-all.ucl
@@ -23,24 +23,6 @@
 installed system to be verified.
 EOD
 
-deps {
-	# Nearly all the tests require atf to run.
-	"atf": {
-		version = "${VERSION}"
-	},
-
-	# The test framework requires Kyua.
-	"kyua": {
-		version = "${VERSION}"
-	},
-
-	# Since the purpose of the tests is to test the base system, the base
-	# system must be installed.
-	"set-base": {
-		version = "${VERSION}"
-	}
-}
-
 annotations {
 	set = tests
 }
diff --git a/release/packages/ucl/tests.ucl b/release/packages/ucl/tests.ucl
--- a/release/packages/ucl/tests.ucl
+++ b/release/packages/ucl/tests.ucl
@@ -18,10 +18,29 @@
 
 
 deps {
+	# Nearly all the tests require atf to run.
+	"atf": {
+		version = "${VERSION}"
+	},
+
 	# Quite a few tests require flua.
 	"flua" {
 		version = "${VERSION}"
 	},
-}
 
+	# Some tests need GoogleTest
+	"googletest": {
+		version = "${VERSION}"
+	},
 
+	# The test framework requires Kyua.
+	"kyua": {
+		version = "${VERSION}"
+	},
+
+	# Since the purpose of the tests is to test the base system, the base
+	# system must be installed.
+	"set-base": {
+		version = "${VERSION}"
+	}
+}