diff -ur a/test/T030-config.sh b/test/T030-config.sh
--- a/test/T030-config.sh	2018-08-06 15:39:37.400772382 +0200
+++ b/test/T030-config.sh	2018-08-06 15:39:45.434276833 +0200
@@ -51,8 +51,8 @@
 fi
 
 cat <<EOF > EXPECTED
-Error opening database at MAIL_DIR/.notmuch: No such file or directory
 database.path=MAIL_DIR
+Error opening database at MAIL_DIR/.notmuch: No such file or directory
 user.name=Notmuch Test Suite
 user.primary_email=test_suite@notmuchmail.org
 user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org
Only in b/test: T030-config.sh.orig
diff -ur a/test/T650-regexp-query.sh b/test/T650-regexp-query.sh
--- a/test/T650-regexp-query.sh	2018-08-06 15:39:37.404105787 +0200
+++ b/test/T650-regexp-query.sh	2018-08-06 15:39:45.434276833 +0200
@@ -140,7 +140,7 @@
 notmuch search 'from:/unbalanced[/' 1>OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: A Xapian exception occurred
-A Xapian exception occurred parsing query: Invalid regular expression
+A Xapian exception occurred parsing query: Missing ']'
 Query string was: from:/unbalanced[/
 EOF
 test_expect_equal_file EXPECTED OUTPUT
Only in b/test: T650-regexp-query.sh.orig