diff --git a/lib/open.cc b/lib/open.cc
index 005872dc..463e38bf 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -249,6 +249,11 @@ _choose_database_path (notmuch_database_t *notmuch,
 	return NOTMUCH_STATUS_NO_DATABASE;
     }
 
+    if (*message) {
+	free (*message);
+	*message = NULL;
+    }
+
     return NOTMUCH_STATUS_SUCCESS;
 }
 
diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index fcaf09d3..1feb5624 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -376,7 +376,6 @@ EOF
 	   ;;
        home_mail|maildir_env)
 	   test_begin_subtest "No errors from config list ($config)"
-	   test_subtest_known_broken
 	   notmuch config list 2>OUTPUT 1>/dev/null
 	   test_expect_equal_file /dev/null OUTPUT
 	   ;;