diff --git a/tests/test-menubar.lua b/tests/test-menubar.lua
new file mode 100644
index 000000000..7c746f64c
--- /dev/null
+++ b/tests/test-menubar.lua
@@ -0,0 +1,36 @@
+-- Test the menubar
+
+local runner = require("_runner")
+local menubar = require("menubar")
+
+runner.run_steps {
+    function(count)
+        -- Just show the menubar and hide it.
+        -- TODO: Write a proper test. But for the mean time this is better than
+        -- nothing (and tells us when errors are thrown).
+
+        if count == 1 then
+            -- Remove the entry for $HOME/.... from the search path. We run with
+            -- HOME=/dev/null and this would cause an error message to be
+            -- printed which would be interpreted as the test failing
+            local entry = menubar.menu_gen.all_menu_dirs[1]
+            assert(string.find(entry, "/dev/null"), entry)
+            table.remove(menubar.menu_gen.all_menu_dirs, 1)
+
+            menubar.show()
+        end
+
+        -- Test that the async population of the menubar is done
+        if #menubar.menu_entries > 0 then
+            menubar.hide()
+            awesome.sync()
+            return true
+        end
+    end,
+
+    function()
+        return true
+    end
+}
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80