diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index 2c5cc1a41..534ca524b 100644
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -22,6 +22,7 @@ test_programs = \
 	private				\
 	closure				\
 	object				\
+	signal-handler			\
 	$(NULL)
 
 # -----------------------------------------------------------------------------
diff --git a/gobject/tests/signal-handler.c b/gobject/tests/signal-handler.c
new file mode 100644
index 000000000..7a236eed9
--- /dev/null
+++ b/gobject/tests/signal-handler.c
@@ -0,0 +1,299 @@
+#include <glib-object.h>
+
+typedef struct {
+  GObject instance;
+} MyObj;
+
+typedef struct {
+  GObjectClass parent_class;
+} MyObjClass;
+
+enum {
+  SIGNAL1,
+  SIGNAL2,
+  LAST_SIGNAL
+};
+
+guint signals[LAST_SIGNAL];
+
+GType my_obj_get_type (void);
+
+G_DEFINE_TYPE (MyObj, my_obj, G_TYPE_OBJECT)
+
+static void
+my_obj_init (MyObj *o)
+{
+}
+
+static void
+my_obj_class_init (MyObjClass *class)
+{
+  signals[SIGNAL1] =
+    g_signal_new ("signal1",
+                  G_TYPE_FROM_CLASS (class),
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+  signals[SIGNAL2] =
+    g_signal_new ("signal2",
+                  G_TYPE_FROM_CLASS (class),
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+static void
+nop (void)
+{
+}
+
+#define HANDLERS 500000
+
+static void
+test_connect_many (void)
+{
+  MyObj *o;
+  gdouble time_elapsed;
+  gint i;
+
+  o = g_object_new (my_obj_get_type (), NULL);
+
+  g_test_timer_start ();
+
+  for (i = 0; i < HANDLERS; i++)
+    g_signal_connect (o, "signal1", G_CALLBACK (nop), NULL); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o);
+
+  g_test_minimized_result (time_elapsed, "connected %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+static void
+test_disconnect_many_ordered (void)
+{
+  MyObj *o;
+  gulong handlers[HANDLERS];
+  gdouble time_elapsed;
+  gint i;
+
+  o = g_object_new (my_obj_get_type (), NULL);
+
+  for (i = 0; i < HANDLERS; i++)
+    handlers[i] = g_signal_connect (o, "signal1", G_CALLBACK (nop), NULL); 
+
+  g_test_timer_start ();
+
+  for (i = 0; i < HANDLERS; i++)
+    g_signal_handler_disconnect (o, handlers[i]); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o);
+
+  g_test_minimized_result (time_elapsed, "disconnected %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+static void
+test_disconnect_many_inverse (void)
+{
+  MyObj *o;
+  gulong handlers[HANDLERS];
+  gdouble time_elapsed;
+  gint i;
+
+  o = g_object_new (my_obj_get_type (), NULL);
+
+  for (i = 0; i < HANDLERS; i++)
+    handlers[i] = g_signal_connect (o, "signal1", G_CALLBACK (nop), NULL); 
+
+  g_test_timer_start ();
+
+  for (i = HANDLERS - 1; i >= 0; i--)
+    g_signal_handler_disconnect (o, handlers[i]); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o);
+
+  g_test_minimized_result (time_elapsed, "disconnected %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+static void
+test_disconnect_many_random (void)
+{
+  MyObj *o;
+  gulong handlers[HANDLERS];
+  gulong id;
+  gdouble time_elapsed;
+  gint i, j;
+
+  o = g_object_new (my_obj_get_type (), NULL);
+
+  for (i = 0; i < HANDLERS; i++)
+    handlers[i] = g_signal_connect (o, "signal1", G_CALLBACK (nop), NULL); 
+
+  for (i = 0; i < HANDLERS; i++)
+    {
+      j = g_test_rand_int_range (0, HANDLERS);
+      id = handlers[i];
+      handlers[i] = handlers[j];
+      handlers[j] = id;
+    }
+
+  g_test_timer_start ();
+
+  for (i = 0; i < HANDLERS; i++)
+    g_signal_handler_disconnect (o, handlers[i]); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o);
+
+  g_test_minimized_result (time_elapsed, "disconnected %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+static void
+test_disconnect_2_signals (void)
+{
+  MyObj *o;
+  gulong handlers[HANDLERS];
+  gulong id;
+  gdouble time_elapsed;
+  gint i, j;
+
+  o = g_object_new (my_obj_get_type (), NULL);
+
+  for (i = 0; i < HANDLERS; i++)
+    {
+      if (i % 2 == 0)
+        handlers[i] = g_signal_connect (o, "signal1", G_CALLBACK (nop), NULL); 
+      else
+        handlers[i] = g_signal_connect (o, "signal2", G_CALLBACK (nop), NULL); 
+    }
+
+  for (i = 0; i < HANDLERS; i++)
+    {
+      j = g_test_rand_int_range (0, HANDLERS);
+      id = handlers[i];
+      handlers[i] = handlers[j];
+      handlers[j] = id;
+    }
+
+  g_test_timer_start ();
+
+  for (i = 0; i < HANDLERS; i++)
+    g_signal_handler_disconnect (o, handlers[i]); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o);
+
+  g_test_minimized_result (time_elapsed, "disconnected %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+static void
+test_disconnect_2_objects (void)
+{
+  MyObj *o1, *o2, *o;
+  gulong handlers[HANDLERS];
+  MyObj *objects[HANDLERS];
+  gulong id;
+  gdouble time_elapsed;
+  gint i, j;
+
+  o1 = g_object_new (my_obj_get_type (), NULL);
+  o2 = g_object_new (my_obj_get_type (), NULL);
+
+  for (i = 0; i < HANDLERS; i++)
+    {
+      if (i % 2 == 0)
+        {
+          handlers[i] = g_signal_connect (o1, "signal1", G_CALLBACK (nop), NULL); 
+          objects[i] = o1;
+        }
+      else
+        {
+          handlers[i] = g_signal_connect (o2, "signal1", G_CALLBACK (nop), NULL); 
+          objects[i] = o2;
+        }
+    }
+
+  for (i = 0; i < HANDLERS; i++)
+    {
+      j = g_test_rand_int_range (0, HANDLERS);
+      id = handlers[i];
+      handlers[i] = handlers[j];
+      handlers[j] = id;
+      o = objects[i];
+      objects[i] = objects[j];
+      objects[j] = o;
+    }
+
+  g_test_timer_start ();
+
+  for (i = 0; i < HANDLERS; i++)
+    g_signal_handler_disconnect (objects[i], handlers[i]); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o1);
+  g_object_unref (o2);
+
+  g_test_minimized_result (time_elapsed, "disconnected %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+static void
+test_block_many (void)
+{
+  MyObj *o;
+  gulong handlers[HANDLERS];
+  gulong id;
+  gdouble time_elapsed;
+  gint i, j;
+
+  o = g_object_new (my_obj_get_type (), NULL);
+
+  for (i = 0; i < HANDLERS; i++)
+    handlers[i] = g_signal_connect (o, "signal1", G_CALLBACK (nop), NULL); 
+
+  for (i = 0; i < HANDLERS; i++)
+    {
+      j = g_test_rand_int_range (0, HANDLERS);
+      id = handlers[i];
+      handlers[i] = handlers[j];
+      handlers[j] = id;
+    }
+
+  g_test_timer_start ();
+
+  for (i = 0; i < HANDLERS; i++)
+    g_signal_handler_block (o, handlers[i]); 
+
+  for (i = HANDLERS - 1; i >= 0; i--)
+    g_signal_handler_unblock (o, handlers[i]); 
+
+  time_elapsed = g_test_timer_elapsed ();
+
+  g_object_unref (o);
+
+  g_test_minimized_result (time_elapsed, "blocked and unblocked %u handlers in %6.3f seconds", HANDLERS, time_elapsed);
+}
+
+int
+main (int argc, char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  if (g_test_perf ())
+    {
+      g_test_add_func ("/signal/handler/connect-many", test_connect_many);
+      g_test_add_func ("/signal/handler/disconnect-many-ordered", test_disconnect_many_ordered);
+      g_test_add_func ("/signal/handler/disconnect-many-inverse", test_disconnect_many_inverse);
+      g_test_add_func ("/signal/handler/disconnect-many-random", test_disconnect_many_random);
+      g_test_add_func ("/signal/handler/disconnect-2-signals", test_disconnect_2_signals);
+      g_test_add_func ("/signal/handler/disconnect-2-objects", test_disconnect_2_objects);
+      g_test_add_func ("/signal/handler/block-many", test_block_many);
+    }
+
+  return g_test_run ();
+}