diff --git a/tests/_wibox_helper.lua b/tests/_wibox_helper.lua
index d60ad7f8c..9b1a31b64 100644
--- a/tests/_wibox_helper.lua
+++ b/tests/_wibox_helper.lua
@@ -18,7 +18,7 @@ return { create_wibox = function()
     local right_layout = wibox.layout.fixed.horizontal()
     local textclock = wibox.widget.textclock()
     right_layout:add(textclock)
-    right_layout:add(awful.widget.layoutbox(1))
+    right_layout:add(awful.widget.layoutbox{screen=1})
 
     -- Now bring it all together (with the tasklist in the middle)
     local layout = wibox.layout.align.horizontal()
diff --git a/tests/test-leaks.lua b/tests/test-leaks.lua
index fa185575b..8a2357601 100644
--- a/tests/test-leaks.lua
+++ b/tests/test-leaks.lua
@@ -41,7 +41,7 @@ end
 
 -- Use the layoutbox for testing delayed tooltips
 local function tooltip_delayed()
-    local l = awful.widget.layoutbox(1)
+    local l = awful.widget.layoutbox{screen = 1}
     local t = l._layoutbox_tooltip
     assert(t)
     return l, t
@@ -63,7 +63,7 @@ collectable(wibox.layout.align.horizontal())
 collectable(awful.widget.launcher({ image = cairo.ImageSurface(cairo.Format.ARGB32, 20, 20), command = "bash" }))
 collectable(awful.widget.prompt())
 collectable(wibox.widget.textclock())
-collectable(awful.widget.layoutbox(1))
+collectable(awful.widget.layoutbox{screen=1})
 
 -- Some widgets do things via timer.delayed_call
 prepare_for_collect = run_delayed_calls