Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 2194)
+++ trunk/tests/conf/conftest.c	(revision 2195)
@@ -89,6 +89,10 @@
 		Message("Need 2 args: policy and %s", (is_text ? "lihata text" : "file name"));
 		return;
 	}
+
+	if (*arg == '*')
+		conf_load_all(NULL, NULL);
+
 	fn = strchr(arg, ' ');
 	if (fn == NULL)
 		goto help;
@@ -263,10 +267,9 @@
 	conf_init();
 	conf_core_init();
 	conf_core_postproc();
-	conf_load_all(NULL, NULL);
+	conf_reset(CFR_SYSTEM, "<main>");
+	conf_reset(CFR_USER, "<main>");
 
-	conf_reset(CFR_SYSTEM, "<conftest>");
-
 	while(getline_cont(stdin)) {
 		char *arg, *cmd = line;
 		while(isspace(*cmd)) cmd++;