diff --git a/test/.gitignore b/test/.gitignore
index 69080e5e..f5968404 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,5 +1,4 @@
 /arg-test
-/corpora.mail
 /hex-xcode
 /parse-time
 /random-corpus
diff --git a/test/Makefile.local b/test/Makefile.local
index 1cf09778..47244e8f 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -81,4 +81,4 @@ check: test
 SRCS := $(SRCS) $(test_srcs)
 CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \
 	 $(dir)/database-test.o \
-	 $(dir)/corpora.mail $(dir)/test-results $(dir)/tmp.*
+	 $(dir)/test-results $(dir)/tmp.*
diff --git a/test/notmuch-test b/test/notmuch-test
index ca68dd41..1a1ae811 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -59,6 +59,6 @@ $NOTMUCH_SRCDIR/test/aggregate-results.sh $NOTMUCH_BUILDDIR/test/test-results/*
 ev=$?
 
 # Clean up
-rm -rf $NOTMUCH_BUILDDIR/test/test-results $NOTMUCH_BUILDDIR/test/corpora.mail
+rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
 exit $ev
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 54247a57..f5d367aa 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -396,14 +396,8 @@ add_email_corpus ()
     corpus=${1:-default}
 
     rm -rf ${MAIL_DIR}
-    if [ -d $TEST_DIRECTORY/corpora.mail/$corpus ]; then
-	cp -a $TEST_DIRECTORY/corpora.mail/$corpus ${MAIL_DIR}
-    else
-	cp -a $NOTMUCH_SRCDIR/test/corpora/$corpus ${MAIL_DIR}
-	notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus"
-	mkdir -p $TEST_DIRECTORY/corpora.mail
-	cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpora.mail/$corpus
-    fi
+    cp -a $NOTMUCH_SRCDIR/test/corpora/$corpus ${MAIL_DIR}
+    notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus"
 }
 
 test_begin_subtest ()