diff --git a/test/Makefile.local b/test/Makefile.local
index 646779e1..bffbbdbd 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -15,7 +15,10 @@ $(dir)/symbol-test: $(dir)/symbol-test.o
 	$(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
 
 .PHONY: test check
-test:	all $(dir)/smtp-dummy $(dir)/symbol-test
+
+test-binaries: $(dir)/smtp-dummy $(dir)/symbol-test
+
+test:	all test-binaries
 	@${dir}/notmuch-test $(OPTIONS)
 
 check: test
diff --git a/test/README b/test/README
index 2481f16d..2e757e0e 100644
--- a/test/README
+++ b/test/README
@@ -13,7 +13,8 @@ notmuch-test script). Either command will run all available tests.
 
 Alternately, you can run a specific subset of tests by simply invoking
 one of the executable scripts in this directory, (such as ./search,
-./reply, etc.)
+./reply, etc). Note that you will probably want "make test-binaries"
+before running individual tests.
 
 The following command-line options are available when running tests: