diff --git a/test/emacs b/test/emacs
index f9da3184..97f46286 100755
--- a/test/emacs
+++ b/test/emacs
@@ -16,6 +16,11 @@ output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq notmuch-sa
 expected=$(cat $EXPECTED/notmuch-hello-with-empty)
 test_expect_equal "$output" "$expected"
 
+test_begin_subtest "No saved searches displayed (all with 0 results)"
+output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" . "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
+expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
+test_expect_equal "$output" "$expected"
+
 test_begin_subtest "Basic notmuch-search view in emacs"
 output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message (buffer-string))' 2>&1)
 expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches
new file mode 100644
index 00000000..7f8206aa
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches
@@ -0,0 +1,10 @@
+   Welcome to notmuch. You have 50 messages.
+
+Search:                                                                     
+
+[Show all tags]
+
+	 Type a search query and hit RET to view matching threads.
+		Edit saved searches with the `edit' button.
+  Hit RET or click on a saved search or tag name to view matching threads.
+    `=' refreshes this screen. `s' jumps to the search box. `q' to quit.