diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 162db44f3d..c287c258df 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -86,4 +86,8 @@ TEST_PROGS			+= filtermodel
 filtermodel_SOURCES		 = filtermodel.c
 filtermodel_LDADD		 = $(progs_ldadd)
 
+TEST_PROGS			+= expander
+expander_SOURCES		 = expander.c
+expander_LDADD		 = $(progs_ldadd)
+
 -include $(top_srcdir)/git.mk
diff --git a/gtk/tests/expander.c b/gtk/tests/expander.c
new file mode 100644
index 0000000000..00b9ea1704
--- /dev/null
+++ b/gtk/tests/expander.c
@@ -0,0 +1,67 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+#include <gtk/gtk.h>
+
+static void
+test_click (void)
+{
+  GtkWidget *window = gtk_test_create_simple_window ("Test Window", "Test click on expander");
+  GtkWidget *expander = gtk_expander_new ("Test Expander");
+  GtkWidget *label = gtk_label_new ("Test Label");
+  gboolean expanded;
+  gboolean simsuccess;
+  gtk_container_add (GTK_CONTAINER (expander), label);
+  gtk_container_add (GTK_CONTAINER (GTK_BIN (window)->child), expander);
+  gtk_widget_show (expander);
+  gtk_widget_show (label);
+  gtk_widget_show_now (window);
+  /* check initial expander state */
+  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
+  g_assert (!expanded);
+  /* check expanding */
+  simsuccess = gtk_test_widget_click (expander, 1, 0);
+  g_assert (simsuccess == TRUE);
+  while (gtk_events_pending ()) /* let expander timeout/idle handlers update */
+    gtk_main_iteration ();
+  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
+  g_assert (expanded);
+  /* check collapsing */
+  simsuccess = gtk_test_widget_click (expander, 1, 0);
+  g_assert (simsuccess == TRUE);
+  while (gtk_events_pending ()) /* let expander timeout/idle handlers update */
+    gtk_main_iteration ();
+  expanded = gtk_expander_get_expanded (GTK_EXPANDER (expander));
+  g_assert (!expanded);
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  gtk_test_init (&argc, &argv);
+  g_test_add_func ("/expander/click", test_click);
+  return g_test_run();
+}