-TEST_SCRIPT := ${dir}/notmuch-perf-test
-DEFAULT_URL := http://notmuchmail.org/releases/${CORPUS_NAME}
+DEFAULT_URL := https://notmuchmail.org/releases/${CORPUS_NAME}
+
+perf-test: time-test memory-test
+
+time-test: setup-perf-test all
+ @echo
+ $(TIME_TEST_SCRIPT) $(OPTIONS)
+
+memory-test: setup-perf-test all
+ @echo
+ $(MEMORY_TEST_SCRIPT) $(OPTIONS)