diff --git a/tests/test-awful-screen.lua b/tests/test-awful-screen.lua
index 692c5f97e..8544572b3 100644
--- a/tests/test-awful-screen.lua
+++ b/tests/test-awful-screen.lua
@@ -80,6 +80,17 @@ local steps = {
 
         assert(called)
 
+        return true
+    end,
+    -- Test the `automatic_factory` getter and setter.
+    function()
+        assert(type(screen.automatic_factory) == "boolean")
+        local orig = screen.automatic_factory
+        screen.automatic_factory = not orig
+        assert(screen.automatic_factory ~= orig)
+        assert(type(screen.automatic_factory) == "boolean")
+        screen.automatic_factory = not screen.automatic_factory
+        assert(screen.automatic_factory == orig)
         return true
     end
 }