diff --git a/tests/examples/screen/geometry.lua b/tests/examples/screen/geometry.lua
index 28841792d..b7765cd18 100644
--- a/tests/examples/screen/geometry.lua
+++ b/tests/examples/screen/geometry.lua
@@ -23,7 +23,7 @@ end --DOC_HIDE
     --DOC_NEWLINE
 
     -- This will shift the workarea by 24px at the top.
-    awful.wibar {
+    local wibar = awful.wibar {
         position = "top",
         height   = 24,
     }
@@ -32,4 +32,5 @@ return { --DOC_HIDE
     factor             = 2    , --DOC_HIDE
     show_boxes         = false, --DOC_HIDE
     highlight_geometry = true , --DOC_HIDE
+    draw_wibar         = wibar, --DOC_HIDE
 } --DOC_HIDE
diff --git a/tests/examples/screen/padding.lua b/tests/examples/screen/padding.lua
index 79b9e049a..3f8b54f67 100644
--- a/tests/examples/screen/padding.lua
+++ b/tests/examples/screen/padding.lua
@@ -26,7 +26,7 @@ end --DOC_HIDE
         bottom = 20,
     }
 
-    awful.wibar { --DOC_HIDE
+    local wibar = awful.wibar { --DOC_HIDE
         position = "top", --DOC_HIDE
         height   = 24, --DOC_HIDE
     } --DOC_HIDE
@@ -35,4 +35,5 @@ return { --DOC_HIDE
     factor                = 2    , --DOC_HIDE
     show_boxes            = false, --DOC_HIDE
     highlight_padding_area = true , --DOC_HIDE
+    draw_wibar            = wibar, --DOC_HIDE
 } --DOC_HIDE
diff --git a/tests/examples/screen/tiling_area.lua b/tests/examples/screen/tiling_area.lua
index a442a7508..5b80e6128 100644
--- a/tests/examples/screen/tiling_area.lua
+++ b/tests/examples/screen/tiling_area.lua
@@ -18,7 +18,7 @@ screen[1].padding = {
     bottom = 20,
 }
 
-awful.wibar {
+local wibar = awful.wibar {
     position = "top",
     height   = 24,
 }
@@ -27,4 +27,5 @@ return {
     factor                = 2    ,
     show_boxes            = false,
     highlight_tiling_area = true ,
+    draw_wibar            = wibar,
 }
diff --git a/tests/examples/screen/workarea.lua b/tests/examples/screen/workarea.lua
index e8823c0f5..26a2266ae 100644
--- a/tests/examples/screen/workarea.lua
+++ b/tests/examples/screen/workarea.lua
@@ -29,7 +29,7 @@ end --DOC_HIDE
     --DOC_NEWLINE
 
     -- This will shift the workarea by 24px at the top.
-    awful.wibar {
+    local wibar = awful.wibar {
         position = "top",
         height   = 24,
     }
@@ -38,4 +38,5 @@ return { --DOC_HIDE
     factor             = 2    , --DOC_HIDE
     show_boxes         = false, --DOC_HIDE
     highlight_workarea = true , --DOC_HIDE
+    draw_wibar         = wibar, --DOC_HIDE
 } --DOC_HIDE