diff --git a/contrib/notmuch-pick/run-tests.sh b/contrib/notmuch-pick/run-tests.sh
index b642ae80..4832d72b 100755
--- a/contrib/notmuch-pick/run-tests.sh
+++ b/contrib/notmuch-pick/run-tests.sh
@@ -8,7 +8,7 @@ fail() {
 }
 
 TESTS="emacs-pick"
-TESTFILES="$TESTS pick.expected-output"
+TESTFILES="$TESTS tree.expected-output"
 
 export PICK_DIR="`cd \`dirname "$0"\` && pwd`"
 PICK_TEST_DIR="$PICK_DIR/test"
diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick
index 2cc3edcb..05ce85d0 100755
--- a/contrib/notmuch-pick/test/emacs-pick
+++ b/contrib/notmuch-pick/test/emacs-pick
@@ -3,7 +3,7 @@
 test_description="emacs tree view interface"
 . test-lib.sh
 
-EXPECTED=$TEST_DIRECTORY/pick.expected-output
+EXPECTED=$TEST_DIRECTORY/tree.expected-output
 
 add_email_corpus
 test_begin_subtest "Do we have emacs"
@@ -21,7 +21,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
 test_begin_subtest "Refreshed notmuch-tree view in emacs"
 test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
@@ -32,7 +32,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
 # In the following tag tests we make sure the display is updated
 # correctly and, in a separate test, that the database is updated
@@ -47,7 +47,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
 	    (notmuch-tree-tag (list "+test_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged
 
 test_begin_subtest "Tag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_tag')
@@ -62,7 +62,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
 	    (notmuch-tree-tag (list "-test_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
 test_begin_subtest "Untag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_tag')
@@ -78,7 +78,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
 	    (notmuch-tree-tag-thread (list "+test_thread_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-thread-tagged
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged
 
 test_begin_subtest "Tag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_thread_tag')
@@ -101,7 +101,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
 	    (notmuch-tree-tag-thread (list "-test_thread_tag"))
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
 test_begin_subtest "Untag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_thread_tag')
@@ -117,7 +117,7 @@ test_emacs '(notmuch-hello)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
 
 test_begin_subtest "Tree view of a single thread (from search)"
 test_emacs '(notmuch-hello)
@@ -129,7 +129,7 @@ test_emacs '(notmuch-hello)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
 
 test_begin_subtest "Tree view of a single thread (from show)"
 test_emacs '(notmuch-hello)
@@ -142,7 +142,7 @@ test_emacs '(notmuch-hello)
 	    (notmuch-test-wait)
 	    (test-output)
 	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
 
 test_begin_subtest "Message window of tree view"
 test_emacs '(notmuch-hello)
@@ -157,7 +157,7 @@ test_emacs '(notmuch-hello)
 	    (test-output)
 	    (delete-other-windows)'
 cp OUTPUT /tmp/mjwout
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-show-window
+test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window
 
 test_begin_subtest "Stash id"
 output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
diff --git a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-show-window b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
similarity index 100%
rename from contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-show-window
rename to contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
diff --git a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
similarity index 100%
rename from contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread
rename to contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
diff --git a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
similarity index 100%
rename from contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox
rename to contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
diff --git a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
similarity index 100%
rename from contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged
rename to contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
diff --git a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
similarity index 100%
rename from contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged
rename to contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged