diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index 95396ae1cceb126894a3900fbb821abc7a053d24..7cd4007beaf15126171e147715d5252b823ca19b 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -255,7 +255,7 @@ int main(int argc, char **argv)
 			mail_user = mail_user_alloc(user, mail_user_dovecot->unexpanded_set);
 			mail_user_set_home(mail_user, home);
 
-			if (mail_user_init(mail_user, &errstr) < 0)
+			if ( mail_user_init(mail_user, &errstr) < 0 )
         		i_fatal("Test user initialization failed: %s", errstr);
 
 			memset(&ns_set, 0, sizeof(ns_set));
@@ -264,9 +264,12 @@ int main(int argc, char **argv)
 			ns = mail_namespaces_init_empty(mail_user);
 			ns->flags |= NAMESPACE_FLAG_NOQUOTA | NAMESPACE_FLAG_NOACL;
 			ns->set = &ns_set;
+
+			if ( mail_storage_create(ns, NULL, 0, &errstr) < 0 )
+		        i_fatal("Test storage creation failed: %s", errstr);
 		}
 
-		if (master_service_set(service, "mail_full_filesystem_access=yes") < 0)
+		if ( master_service_set(service, "mail_full_filesystem_access=yes") < 0 )
 			i_unreached(); 
 
 		/* Initialize raw mail object */
diff --git a/src/testsuite/testsuite-mailstore.c b/src/testsuite/testsuite-mailstore.c
index 91746e5c6ac9b72b42a85f8ff83c99e0c5b56773..878baa67a2666a85790403c93430498c6c33fe57 100644
--- a/src/testsuite/testsuite-mailstore.c
+++ b/src/testsuite/testsuite-mailstore.c
@@ -65,19 +65,22 @@ void testsuite_mailstore_init
 	mail_user = mail_user_alloc(user, service_user->unexpanded_set);
 	mail_user_set_home(mail_user, home);
 
-	if (mail_user_init(mail_user, &errstr) < 0)
+	if ( mail_user_init(mail_user, &errstr) < 0 )
 		i_fatal("Test user initialization failed: %s", errstr);
 
 	memset(&ns_set, 0, sizeof(ns_set));
 	ns_set.location = t_strconcat("maildir:", testsuite_mailstore_tmp, NULL);
-	//ns_set.inbox = TRUE;
-	//ns_set.separator = ".";
-	//ns_set.subscriptions = TRUE;
+	ns_set.inbox = TRUE;
+	ns_set.separator = ".";
+	ns_set.subscriptions = TRUE;
 
 	ns = mail_namespaces_init_empty(mail_user);
 	ns->flags |= NAMESPACE_FLAG_NOQUOTA | NAMESPACE_FLAG_NOACL;
 	ns->set = &ns_set;
 
+	if ( mail_storage_create(ns, NULL, 0, &errstr) < 0 )
+        i_fatal("Test storage creation failed: %s", errstr);
+
 	testsuite_mailstore_user = mail_user;
 }