diff --git a/tests/examples/awful/template.lua b/tests/examples/awful/template.lua
index 45831d1e..758d2280 100644
--- a/tests/examples/awful/template.lua
+++ b/tests/examples/awful/template.lua
@@ -99,6 +99,7 @@ end
 local function client_widget(c, col, label)
     local geo = c:geometry()
     local bw = c.border_width or beautiful.border_width or 0
+    local bc = c.border_color or beautiful.border_color
 
     local l = wibox.layout.align.vertical()
     l.fill_space = true
@@ -144,7 +145,7 @@ local function client_widget(c, col, label)
             layout = wibox.layout.stack
         },
         border_width = bw,
-        border_color = beautiful.border_color,
+        border_color = bc,
         shape_clip   = true,
         fg           = beautiful.fg_normal or "#000000",
         bg           = col,
diff --git a/tests/examples/shims/client.lua b/tests/examples/shims/client.lua
index 2a481864..f816016b 100644
--- a/tests/examples/shims/client.lua
+++ b/tests/examples/shims/client.lua
@@ -72,6 +72,7 @@ function client.gen_fake(args)
     ret.valid = true
     ret.size_hints = {}
     ret._border_width = 1
+    ret._tags = args and args.tags or nil
     ret.icon_sizes = {{16,16}}
     ret.name = "Example Client"
     ret._private._struts = { top = 0, right = 0, left = 0, bottom = 0 }