diff --git a/ChangeLog b/ChangeLog
index 7fc0c8fe3b..c1c06416f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-11  Federico Mena Quintero  <federico@ximian.com>
 
+	* tests/autotestfilechooser.c (main): Use
+	g_log_set_default_handler() instead of explicitly setting a
+	handler for each domain.
+
 	* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get
 	the base path of the volume if it is mounted.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7fc0c8fe3b..c1c06416f0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-11-11  Federico Mena Quintero  <federico@ximian.com>
 
+	* tests/autotestfilechooser.c (main): Use
+	g_log_set_default_handler() instead of explicitly setting a
+	handler for each domain.
+
 	* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get
 	the base path of the volume if it is mounted.
 
diff --git a/tests/autotestfilechooser.c b/tests/autotestfilechooser.c
index d10feec0de..78de74a2eb 100644
--- a/tests/autotestfilechooser.c
+++ b/tests/autotestfilechooser.c
@@ -568,6 +568,7 @@ test_button_folder_states (void)
   return passed;
 }
 
+static GLogFunc default_log_handler;
 static int num_warnings;
 static int num_errors;
 static int num_critical_errors;
@@ -587,36 +588,31 @@ log_override_cb (const gchar   *log_domain,
   if (log_level & G_LOG_LEVEL_CRITICAL)
     num_critical_errors++;
 
-  g_log_default_handler (log_domain, log_level, message, user_data);
+  (* default_log_handler) (log_domain, log_level, message, user_data);
 }
 
 int
 main (int argc, char **argv)
 {
-  static const char *domains[] = {
-    "Glib", "GLib-GObject", "GModule", "GThread", "Pango", "Gdk", "GdkPixbuf", "Gtk", "libgnomevfs"
-  };
-
   gboolean passed;
   gboolean zero_warnings;
   gboolean zero_errors;
   gboolean zero_critical_errors;
-  int i;
 
-  /* FIXME: use g_log_set_default_handler() instead of this mess */
-
-  for (i = 0; i < G_N_ELEMENTS (domains); i++)
-    g_log_set_handler (domains[i],
-		       G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL | G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING,
-		       log_override_cb, NULL);
+  default_log_handler = g_log_set_default_handler (log_override_cb, NULL);
+  passed = TRUE;
 
   gtk_init (&argc, &argv);
 
-  passed = test_action_widgets ();
+  /* Start tests */
+
+  passed = passed && test_action_widgets ();
   passed = passed && test_reload ();
   passed = passed && test_button_folder_states ();
   log_test (passed, "main(): main tests");
 
+  /* Warnings and errors */
+
   zero_warnings = num_warnings == 0;
   zero_errors = num_errors == 0;
   zero_critical_errors = num_critical_errors == 0;
@@ -625,6 +621,8 @@ main (int argc, char **argv)
   log_test (zero_errors, "main(): zero errors (actual number %d)", num_errors);
   log_test (zero_critical_errors, "main(): zero critical errors (actual number %d)", num_critical_errors);
 
+  /* Done */
+
   passed = passed && zero_warnings && zero_errors && zero_critical_errors;
 
   log_test (passed, "main(): ALL TESTS");