diff --git a/tests/testthat/_snaps/legend-draw/all-legend-keys.svg b/tests/testthat/_snaps/legend-draw/all-legend-keys.svg
index 148c9dce18..c1ea77a335 100644
--- a/tests/testthat/_snaps/legend-draw/all-legend-keys.svg
+++ b/tests/testthat/_snaps/legend-draw/all-legend-keys.svg
@@ -34,7 +34,7 @@
 <polyline points='307.89,265.19 320.85,265.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt; stroke-linejoin: miter;' />
 <polyline points='314.37,272.10 314.37,272.10 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt; stroke-linejoin: miter;' />
 <polyline points='314.37,258.27 314.37,258.27 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt; stroke-linejoin: miter;' />
-<text x='314.37' y='312.13' text-anchor='middle' style='font-size: 8.00px; font-family: sans;' textLength='34.69px' lengthAdjust='spacingAndGlyphs'>crosssbar</text>
+<text x='314.37' y='312.13' text-anchor='middle' style='font-size: 8.00px; font-family: sans;' textLength='30.69px' lengthAdjust='spacingAndGlyphs'>crossbar</text>
 <rect x='307.89' y='320.89' width='12.96' height='8.64' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter;' />
 <polyline points='307.89,325.21 320.85,325.21 ' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter;' />
 <text x='314.37' y='372.15' text-anchor='middle' style='font-size: 8.00px; font-family: sans;' textLength='15.57px' lengthAdjust='spacingAndGlyphs'>path</text>
diff --git a/tests/testthat/test-legend-draw.R b/tests/testthat/test-legend-draw.R
index 9d528ecc0b..5f4cc01032 100644
--- a/tests/testthat/test-legend-draw.R
+++ b/tests/testthat/test-legend-draw.R
@@ -7,7 +7,8 @@ test_that("all keys can be drawn without 'params'", {
 
   # Render every key
   # If we're to develop new legend keys, we can keep appending this pattern
-  # for new keys and layout should adjust automatically
+  # for new keys and layout should adjust automatically.
+  # This is also an implicit test whether the key can be constructed without errors
   keys <- list(
     point      = draw_key_point(GeomPoint$use_defaults(NULL),           params, size),
     abline     = draw_key_abline(GeomAbline$use_defaults(NULL),         params, size),
@@ -15,7 +16,7 @@ test_that("all keys can be drawn without 'params'", {
     polygon    = draw_key_polygon(GeomPolygon$use_defaults(NULL),       params, size),
     blank      = draw_key_blank(GeomBlank$use_defaults(NULL),           params, size),
     boxplot    = draw_key_boxplot(GeomBoxplot$use_defaults(NULL),       params, size),
-    crosssbar  = draw_key_crossbar(GeomCrossbar$use_defaults(NULL),     params, size),
+    crossbar   = draw_key_crossbar(GeomCrossbar$use_defaults(NULL),     params, size),
     path       = draw_key_path(GeomPath$use_defaults(NULL),             params, size),
     vpath      = draw_key_vpath(GeomPath$use_defaults(NULL),            params, size),
     dotplot    = draw_key_dotplot(GeomDotplot$use_defaults(NULL),       params, size),
@@ -28,8 +29,14 @@ test_that("all keys can be drawn without 'params'", {
     timeseries = draw_key_timeseries(GeomPath$use_defaults(NULL),       params, size)
   )
 
+  # Test that we've covered all exported keys above
+  nse <- getNamespaceExports(asNamespace("ggplot2"))
+  nse <- grep("^draw_key", nse, value = TRUE)
+  nse <- gsub("^draw_key_", "", nse)
+  expect_in(nse, names(keys))
+
+  # Add title to every key
   template <- gtable(width = unit(size, "mm"), heights = unit(c(1, size), c("lines", "mm")))
-  # Add names
   keys <- Map(
     function(key, name) {
       text <- textGrob(name, gp = gpar(fontsize = 8))
@@ -38,12 +45,14 @@ test_that("all keys can be drawn without 'params'", {
     key = keys, name = names(keys)
   )
 
+  # Set layout
   n <- length(keys)
   nrow <- ceiling(n / 5)
   ncol <- ceiling(n / nrow)
   mtx <- matrix(list(zeroGrob()), nrow = nrow, ncol = ncol)
   mtx[seq_along(keys)] <- keys
 
+  # Render as gtable
   gt <- gtable_matrix(
     name = "layout", grobs = mtx,
     widths  = unit(rep(size, ncol(mtx)), "mm"),
@@ -54,5 +63,4 @@ test_that("all keys can be drawn without 'params'", {
   gt <- gtable_add_row_space(gt, unit(1, "cm"))
 
   expect_doppelganger("all legend keys", gt)
-
 })