diff --git a/spec/cli/check_spec.lua b/spec/cli/check_spec.lua
index 347c369aa..17f5bf453 100644
--- a/spec/cli/check_spec.lua
+++ b/spec/cli/check_spec.lua
@@ -1,7 +1,7 @@
 local assert = require("luassert")
 local util = require("spec.util")
 
-describe("tl check", function()
+describe("#cli tl check", function()
    describe("on .tl files", function()
       it("reports if file does not exist", function()
          local pd = io.popen(util.tl_cmd("check", "file_that_does_not_exist.tl") .. " 2>&1", "r")
diff --git a/spec/cli/feat_spec.lua b/spec/cli/feat_spec.lua
index 7741cc8f3..d96471bdb 100644
--- a/spec/cli/feat_spec.lua
+++ b/spec/cli/feat_spec.lua
@@ -52,7 +52,7 @@ local test_cases = {
    }
 }
 
-describe("feat flags", function()
+describe("#cli feat flags", function()
    for flag, tests in pairs(test_cases) do
       describe(flag, function()
          for _, case in ipairs(tests) do
diff --git a/spec/cli/gen_spec.lua b/spec/cli/gen_spec.lua
index 7f537e109..ae8460cb1 100644
--- a/spec/cli/gen_spec.lua
+++ b/spec/cli/gen_spec.lua
@@ -102,7 +102,7 @@ local function tl_to_lua(name)
    return (name:gsub("%.tl$", ".lua"):gsub("^" .. util.os_tmp .. util.os_sep, ""))
 end
 
-describe("tl gen", function()
+describe("#cli tl gen", function()
    setup(util.chdir_setup)
    teardown(util.chdir_teardown)
    describe("on .tl files", function()
diff --git a/spec/cli/global_env_def_spec.lua b/spec/cli/global_env_def_spec.lua
index 8dc71a01b..20c9bdaea 100644
--- a/spec/cli/global_env_def_spec.lua
+++ b/spec/cli/global_env_def_spec.lua
@@ -1,7 +1,7 @@
 local assert = require("luassert")
 local util = require("spec.util")
 
-describe("--global-env-def argument", function()
+describe("#cli --global-env-def argument", function()
    it("exports globals from a module", function()
       util.do_in(util.write_tmp_dir(finally, {
          mod = {
diff --git a/spec/cli/include_dir_spec.lua b/spec/cli/include_dir_spec.lua
index 20bdbe00a..cadfb5d89 100644
--- a/spec/cli/include_dir_spec.lua
+++ b/spec/cli/include_dir_spec.lua
@@ -1,7 +1,7 @@
 local assert = require("luassert")
 local util = require("spec.util")
 
-describe("-I --include-dir argument", function()
+describe("#cli -I --include-dir argument", function()
    it("adds a directory to package.path", function()
       util.do_in(util.write_tmp_dir(finally, {
          mod = {
diff --git a/spec/cli/output_spec.lua b/spec/cli/output_spec.lua
index 92956044f..b16dbccdb 100644
--- a/spec/cli/output_spec.lua
+++ b/spec/cli/output_spec.lua
@@ -1,6 +1,6 @@
 local util = require("spec.util")
 
-describe("-o --output", function()
+describe("#cli -o --output", function()
    it("should gen in the current directory when not provided", function()
       util.run_mock_project(finally, {
          dir_structure = {
diff --git a/spec/cli/quiet_spec.lua b/spec/cli/quiet_spec.lua
index 11031fcc6..922b7cce9 100644
--- a/spec/cli/quiet_spec.lua
+++ b/spec/cli/quiet_spec.lua
@@ -1,6 +1,6 @@
 local util = require("spec.util")
 
-describe("-q --quiet flag", function()
+describe("#cli -q --quiet flag", function()
    setup(util.chdir_setup)
    teardown(util.chdir_teardown)
    it("silences warnings from tlconfig.lua", function()
diff --git a/spec/cli/run_spec.lua b/spec/cli/run_spec.lua
index 26f9d7335..c785161c0 100644
--- a/spec/cli/run_spec.lua
+++ b/spec/cli/run_spec.lua
@@ -1,6 +1,6 @@
 local util = require("spec.util")
 
-describe("tl run", function()
+describe("#cli tl run", function()
    setup(util.chdir_setup)
    teardown(util.chdir_teardown)
    describe("on .tl files", function()
diff --git a/spec/cli/types_spec.lua b/spec/cli/types_spec.lua
index 61d41f549..bcb35f1ff 100644
--- a/spec/cli/types_spec.lua
+++ b/spec/cli/types_spec.lua
@@ -2,7 +2,7 @@ local assert = require("luassert")
 local json = require("dkjson")
 local util = require("spec.util")
 
-describe("tl types works like check", function()
+describe("#cli tl types works like check", function()
    describe("on .tl files", function()
       it("reports missing files", function()
          local pd = io.popen(util.tl_cmd("types", "nonexistent_file") .. "2>&1 1>" .. util.os_null, "r")
diff --git a/spec/cli/warning_spec.lua b/spec/cli/warning_spec.lua
index 60eb4a74e..0d28a8b92 100644
--- a/spec/cli/warning_spec.lua
+++ b/spec/cli/warning_spec.lua
@@ -2,7 +2,7 @@ local assert = require("luassert")
 local util = require("spec.util")
 local tl = require("tl")
 
-describe("tl warnings", function()
+describe("#cli tl warnings", function()
    it("reports existing warning types when given no arguments", function()
       local pd = io.popen(util.tl_cmd("warnings"), "r")
       local output = pd:read("*a")
@@ -16,7 +16,7 @@ describe("tl warnings", function()
    end)
 end)
 
-describe("warning flags", function()
+describe("#cli warning flags", function()
    describe("in tlconfig.lua", function()
       describe("disable_warnings", function()
          it("disables the given warnings", function()