diff --git a/src/lib-sieve/util/test-edit-mail.c b/src/lib-sieve/util/test-edit-mail.c
index e29bb85fb82cbc57dc68633ca7c59a43230d7ac9..285e638a5987526521e1721f426d59f6252fa060 100644
--- a/src/lib-sieve/util/test-edit-mail.c
+++ b/src/lib-sieve/util/test-edit-mail.c
@@ -55,7 +55,8 @@ static int test_init_mail_user(void)
 
 	struct mail_storage_service_input input = {
 		.userdb_fields = (const char*const[]){
-			t_strdup_printf("mail=maildir:~/"),
+			"mail_driver=maildir",
+			"mail_path=~/",
 			t_strdup_printf("home=%s", mail_home),
 			NULL
 		},
diff --git a/src/testsuite/testsuite-mailstore.c b/src/testsuite/testsuite-mailstore.c
index a703e850bb67ed99147dbb2364106639d134f4b1..d685148c1470a5ebfc60446d721f83eaf769aedf 100644
--- a/src/testsuite/testsuite-mailstore.c
+++ b/src/testsuite/testsuite-mailstore.c
@@ -83,8 +83,8 @@ void testsuite_mailstore_init(void)
 		i_fatal("Failed to get working directory: %s", error);
 	const char *const userdb_fields[] = {
 		t_strconcat("home=", cwd, NULL),
-		t_strconcat("mail_location=maildir:",
-			    testsuite_mailstore_location, NULL),
+		"mail_driver=maildir",
+		t_strconcat("mail_path=", testsuite_mailstore_location, NULL),
 		"mail_attribute/dict_driver=file",
 		t_strconcat("dict_file_path=", testsuite_mailstore_attrs, NULL),
 		NULL,