diff --git a/tests/examples/awful/wallpaper/add_screen1.lua b/tests/examples/awful/wallpaper/add_screen1.lua
index 03365a9a..570884d9 100644
--- a/tests/examples/awful/wallpaper/add_screen1.lua
+++ b/tests/examples/awful/wallpaper/add_screen1.lua
@@ -11,7 +11,7 @@ screen._add_screen {x = 322, y = 0, width = 160, height = 96}
 require("_default_look")
 
        awful.wallpaper {
-           screen = screen[1], --DOC_HIDE
+           screen = screen[1],
            bg     = "#222222",
            widget = wibox.widget {
                 {
diff --git a/tests/examples/awful/wallpaper/add_screen2.lua b/tests/examples/awful/wallpaper/add_screen2.lua
index 8dcfcfe1..b7fead0f 100644
--- a/tests/examples/awful/wallpaper/add_screen2.lua
+++ b/tests/examples/awful/wallpaper/add_screen2.lua
@@ -11,7 +11,7 @@ screen._add_screen {x = 322, y = 0, width = 160, height = 96}
 require("_default_look")
 
        local wall = awful.wallpaper {
-           screen = screen[1], --DOC_HIDE
+           screen = screen[1],
            bg     = "#222222",
            widget = wibox.widget {
                 {
diff --git a/tests/examples/awful/wallpaper/add_screen3.lua b/tests/examples/awful/wallpaper/add_screen3.lua
index 81638aad..b46b12ed 100644
--- a/tests/examples/awful/wallpaper/add_screen3.lua
+++ b/tests/examples/awful/wallpaper/add_screen3.lua
@@ -12,7 +12,7 @@ screen._add_screen {x = 322, y = 0, width = 160, height = 96}
 require("_default_look")
 
        local wall = awful.wallpaper {
-           screen = screen[1], --DOC_HIDE
+           screen = screen[1],
            bg     = "#222222",
            widget = wibox.widget {
                 {
diff --git a/tests/examples/awful/wallpaper/corner1.lua b/tests/examples/awful/wallpaper/corner1.lua
index 4f036052..1faf70e5 100644
--- a/tests/examples/awful/wallpaper/corner1.lua
+++ b/tests/examples/awful/wallpaper/corner1.lua
@@ -7,10 +7,10 @@ local wibox = require("wibox") --DOC_HIDE
 local beautiful = require("beautiful") --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
-
+local s = screen[1] --DOC_HIDE
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        bg     = "#000000",
        widget = {
            {
diff --git a/tests/examples/awful/wallpaper/gradient1.lua b/tests/examples/awful/wallpaper/gradient1.lua
index fa1a7b29..923739c4 100644
--- a/tests/examples/awful/wallpaper/gradient1.lua
+++ b/tests/examples/awful/wallpaper/gradient1.lua
@@ -2,10 +2,11 @@
 local awful =  { wallpaper = require("awful.wallpaper") } --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
+local s = screen[1] --DOC_HIDE
 
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        bg     = {
            type  = "linear" ,
            from  = { 0, 0  },
diff --git a/tests/examples/awful/wallpaper/gradient2.lua b/tests/examples/awful/wallpaper/gradient2.lua
index 0946d598..9c1f9edb 100644
--- a/tests/examples/awful/wallpaper/gradient2.lua
+++ b/tests/examples/awful/wallpaper/gradient2.lua
@@ -2,10 +2,11 @@
 local awful =  { wallpaper = require("awful.wallpaper") } --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
+local s = screen[1] --DOC_HIDE
 
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        bg     = {
            type = "radial",
            from  = { 160, 98, 20  },
diff --git a/tests/examples/awful/wallpaper/mazimized1.lua b/tests/examples/awful/wallpaper/mazimized1.lua
index 58dbc11c..36cbb4a0 100644
--- a/tests/examples/awful/wallpaper/mazimized1.lua
+++ b/tests/examples/awful/wallpaper/mazimized1.lua
@@ -2,10 +2,11 @@
 local awful =  { wallpaper = require("awful.wallpaper") } --DOC_HIDE
 local wibox = require("wibox") --DOC_HIDE
 local beautiful = require("beautiful") --DOC_HIDE
+local s = screen[1] --DOC_HIDE
 
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        widget = {
            {
                image  = beautiful.wallpaper,
diff --git a/tests/examples/awful/wallpaper/mazimized2.lua b/tests/examples/awful/wallpaper/mazimized2.lua
index 425d2c90..5dd7e36e 100644
--- a/tests/examples/awful/wallpaper/mazimized2.lua
+++ b/tests/examples/awful/wallpaper/mazimized2.lua
@@ -4,10 +4,11 @@ local wibox = require("wibox") --DOC_HIDE
 local beautiful = require("beautiful") --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
+local s = screen[1] --DOC_HIDE
 
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        bg     = "#0000ff",
        widget = {
            {
diff --git a/tests/examples/awful/wallpaper/mazimized3.lua b/tests/examples/awful/wallpaper/mazimized3.lua
index 596b5ebb..52d35440 100644
--- a/tests/examples/awful/wallpaper/mazimized3.lua
+++ b/tests/examples/awful/wallpaper/mazimized3.lua
@@ -4,10 +4,10 @@ local wibox = require("wibox") --DOC_HIDE
 local beautiful = require("beautiful") --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
-
+local s = screen[1] --DOC_HIDE
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        widget = {
             horizontal_fit_policy = "fit",
             vertical_fit_policy   = "fit",
diff --git a/tests/examples/awful/wallpaper/tiled1.lua b/tests/examples/awful/wallpaper/tiled1.lua
index 460648e7..68f8e65b 100644
--- a/tests/examples/awful/wallpaper/tiled1.lua
+++ b/tests/examples/awful/wallpaper/tiled1.lua
@@ -4,10 +4,10 @@ local wibox = require("wibox") --DOC_HIDE
 local beautiful = require("beautiful") --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
-
+local s = screen[1] --DOC_HIDE
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        bg     = "#0000ff",
        widget = {
            {
diff --git a/tests/examples/awful/wallpaper/tiled2.lua b/tests/examples/awful/wallpaper/tiled2.lua
index ecb5ef7c..76576e78 100644
--- a/tests/examples/awful/wallpaper/tiled2.lua
+++ b/tests/examples/awful/wallpaper/tiled2.lua
@@ -4,10 +4,10 @@ local wibox = require("wibox") --DOC_HIDE
 local gears = { shape = require("gears.shape") } --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
-
+local s = screen[1] --DOC_HIDE
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        bg     = "#0000ff",
        widget = {
            {
diff --git a/tests/examples/awful/wallpaper/widget1.lua b/tests/examples/awful/wallpaper/widget1.lua
index c2fe6128..26228e13 100644
--- a/tests/examples/awful/wallpaper/widget1.lua
+++ b/tests/examples/awful/wallpaper/widget1.lua
@@ -4,10 +4,10 @@ local wibox = require("wibox") --DOC_HIDE
 local gears = {color = require("gears.color") } --DOC_HIDE
 
 screen[1]._resize {x = 0, y = 0, width = 320, height = 196} --DOC_HIDE
-
+local s = screen[1] --DOC_HIDE
 
    awful.wallpaper {
-       screen = screen[1], --DOC_HIDE
+       screen = s,
        widget = wibox.widget {
             fit = function(_, width, height)
                 return width, height