diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -191,6 +191,10 @@
 -- support or you don't.
 elseif pkgname:match("%-dev$") or pkgname:match("^lib.*%-man$") then
 	set = "devel"
+-- Don't separate tests and tests-dbg into 2 sets, if the user wants tests
+-- they should be able to debug failures.
+elseif set == "tests" then
+	set = set
 -- If this is a -dbg package, it goes in <set>-dbg, which means the user can
 -- install debug symbols only for the sets they have installed.
 elseif pkgname:match("%-dbg$") then
diff --git a/release/packages/sets/tests.ucl b/release/packages/sets/tests.ucl
new file mode 100644
--- /dev/null
+++ b/release/packages/sets/tests.ucl
@@ -0,0 +1,5 @@
+comment = "System test suite"
+
+desc = <<EOD
+This metapackage installs the system test suite.
+EOD
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
@@ -2,3 +2,7 @@
 desc = <<EOD
 Test Suite
 EOD
+
+annotations {
+	set = tests
+}