diff --git a/lib/naughty/notification.lua b/lib/naughty/notification.lua
index 6574d6de..f06d21c8 100644
--- a/lib/naughty/notification.lua
+++ b/lib/naughty/notification.lua
@@ -467,7 +467,7 @@ function notification:reset_timeout(new_timeout)
     -- Do not set `self.timeout` to `self.timeout` since that would create the
     -- timer before the constructor ends.
     if new_timeout and self.timer then
-        self.timeout = new_timeout or self.timeout
+        self.timeout = new_timeout
     end
 
     if self.timer and not self.timer.started then
diff --git a/tests/examples/shims/client.lua b/tests/examples/shims/client.lua
index c65e3d03..758c293f 100644
--- a/tests/examples/shims/client.lua
+++ b/tests/examples/shims/client.lua
@@ -200,14 +200,6 @@ function client.gen_fake(args)
         return ret.data._struts
     end
 
-    function ret:struts(new)
-        for k, v in pairs(new or {}) do
-            ret.data._struts[k] = v
-        end
-
-        return ret.data._struts
-    end
-
     -- Set a dummy one for now since set_screen will corrupt it.
     ret._old_geo = {}