4 files changed, 8 insertions, 7 deletions
diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c
index 50a89f89e8..afd35b1704 100644
--- a/camel/tests/folder/test2.c
+++ b/camel/tests/folder/test2.c
@@ -44,12 +44,12 @@ int main(int argc, char **argv)
 	for (i=0;i<ARRAY_LEN(stores);i++) {
 		char *name = stores[i];
 
-		test_folder_message_ops(session, name, TRUE, FALSE);
+		test_folder_message_ops(session, name, TRUE, "testbox");
 	}
 
 	/* create a pseudo-spool file, and check that */
 	creat("/tmp/camel-test/testbox", 0600);
-	test_folder_message_ops(session, "spool:///tmp/camel-test/testbox", FALSE, TRUE);
+	test_folder_message_ops(session, "spool:///tmp/camel-test/testbox", FALSE, "INBOX");
 
 	check_unref(session, 1);
 	camel_exception_free(ex);
diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c
index eb0bd3420b..e6c58e023d 100644
--- a/camel/tests/folder/test4.c
+++ b/camel/tests/folder/test4.c
@@ -41,9 +41,9 @@ int main(int argc, char **argv)
 			/* tells make check to ignore us in the total count */
 			_exit(77);
 		}
-		camel_test_nonfatal("The IMAP code is just rooted");
+		/*camel_test_nonfatal("The IMAP code is just rooted");*/
 		test_folder_basic(session, path, FALSE, FALSE);
-		camel_test_fatal();
+		/*camel_test_fatal();*/
 	}
 
 	camel_object_unref((CamelObject *)session);
diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c
index 215fa999bf..f0fd8a25ee 100644
--- a/camel/tests/folder/test6.c
+++ b/camel/tests/folder/test6.c
@@ -1,7 +1,7 @@
 /* folder testing */
 
 #include "camel-test.h"
-#include "messages.h"
+#include "folders.h"
 #include "session.h"
 
 #include <camel/camel-exception.h>
@@ -44,7 +44,8 @@ int main(int argc, char **argv)
 			_exit(77);
 		}
 		/*camel_test_nonfatal("The IMAP code is just rooted");*/
-		test_folder_message_ops(session, path, FALSE);
+		test_folder_message_ops(session, path, FALSE, "testbox");
+		test_folder_message_ops(session, path, FALSE, "INBOX");
 		/*camel_test_fatal();*/
 	}
 
diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c
index 2f08712e4c..3dee12916d 100644
--- a/camel/tests/folder/test7.c
+++ b/camel/tests/folder/test7.c
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 			_exit(77);
 		}
 		camel_test_nonfatal("Dont know how many tests apply to NNTP");
-		test_folder_message_ops(session, path, FALSE);
+		test_folder_message_ops(session, path, FALSE, "testbox");
 		camel_test_fatal();
 	}