diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index d9f8332364..629402df91 100644
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -39,6 +39,7 @@ TEST_PROGS += 			\
 	expander		\
 	firefox-stylecontext	\
 	floating		\
+	gestures		\
 	grid			\
 	gtkmenu			\
 	icontheme		\
diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
new file mode 100644
index 0000000000..17d4ffd1fa
--- /dev/null
+++ b/testsuite/gtk/gestures.c
@@ -0,0 +1,303 @@
+#include <gtk/gtk.h>
+
+static gboolean
+inject_press (gpointer data)
+{
+  GtkWidget *widget = data;
+  GdkEventButton *ev;
+  GdkDisplay *display;
+  GdkDeviceManager *dm;
+  GdkDevice *device;
+
+  display = gtk_widget_get_display (widget);
+  dm = gdk_display_get_device_manager (display);
+  device = gdk_device_manager_get_client_pointer (dm);
+
+  ev = (GdkEventButton*)gdk_event_new (GDK_BUTTON_PRESS);
+  ev->window = g_object_ref (gtk_widget_get_window (widget));
+  ev->time = GDK_CURRENT_TIME;
+  ev->x = 1;
+  ev->y = 1;
+  ev->state = 0;
+  ev->button = 1;
+  gdk_event_set_device ((GdkEvent*)ev, device);
+
+  gtk_main_do_event ((GdkEvent*)ev);
+
+  gdk_event_free ((GdkEvent*)ev);
+
+  return G_SOURCE_REMOVE;
+}
+
+static const gchar *
+phase_nick (GtkPropagationPhase phase)
+{
+ GTypeClass *class;
+ GEnumValue *value;
+
+ class = g_type_class_ref (GTK_TYPE_PROPAGATION_PHASE);
+ value = g_enum_get_value ((GEnumClass*)class, phase);
+ g_type_class_unref (class);  
+
+ return value->value_nick;
+}
+
+typedef struct {
+  GString *str;
+  gboolean exit;
+} LegacyData;
+
+static gboolean
+legacy_cb (GtkWidget *w, GdkEventButton *button, gpointer data)
+{
+  LegacyData *ld = data;
+
+  if (ld->str->len > 0)
+    g_string_append (ld->str, ", ");
+  g_string_append_printf (ld->str, "legacy %s", gtk_widget_get_name (w));
+
+  return ld->exit;
+}
+
+typedef struct {
+  GString *str;
+  GtkEventSequenceState state;
+} GestureData;
+
+static void
+press_cb (GtkGesture *g, gint n_press, gdouble x, gdouble y, gpointer data)
+{
+  GtkEventController *c = GTK_EVENT_CONTROLLER (g);
+  GtkWidget *w;
+  GtkPropagationPhase phase;
+  GestureData *gd = data;
+  
+  w = gtk_event_controller_get_widget (c);
+  phase = gtk_event_controller_get_propagation_phase (c);
+
+  if (gd->str->len > 0)
+    g_string_append (gd->str, ", ");
+  g_string_append_printf (gd->str, "%s %s", phase_nick (phase), gtk_widget_get_name (w));
+
+  if (gd->state != GTK_EVENT_SEQUENCE_NONE)
+    gtk_gesture_set_state (g, gd->state);
+}
+
+static GtkGesture *
+add_gesture (GtkWidget *w, GtkPropagationPhase phase, GString *str, GtkEventSequenceState state)
+{
+  GtkGesture *g;
+  GestureData *data;
+
+  data = g_new (GestureData, 1);
+  data->str = str;
+  data->state = state;
+
+  g = gtk_gesture_multi_press_new (w);
+  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (g), FALSE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (g), 1);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (g), phase);
+  g_signal_connect (g, "pressed", G_CALLBACK (press_cb), data);
+
+  return g;
+}
+
+static void
+add_legacy (GtkWidget *w, GString *str, gboolean exit)
+{
+  LegacyData *data;
+
+  data = g_new (LegacyData, 1);
+  data->str = str;
+  data->exit = exit;
+  g_signal_connect (w, "button-press-event", G_CALLBACK (legacy_cb), data);
+}
+
+static void
+test_phases (void)
+{
+  GtkWidget *A, *B, *C;
+  GString *str;
+
+  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (A, "A");
+  B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_name (B, "B");
+  C = gtk_event_box_new ();
+  gtk_widget_set_hexpand (C, TRUE);
+  gtk_widget_set_vexpand (C, TRUE);
+  gtk_widget_set_name (C, "C");
+
+  gtk_container_add (GTK_CONTAINER (A), B);
+  gtk_container_add (GTK_CONTAINER (B), C);
+
+  gtk_widget_show_all (A);
+
+  str = g_string_new ("");
+
+  add_gesture (A, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+
+  inject_press (C);
+
+  g_assert_cmpstr (str->str, ==,
+      "capture A, capture B, capture C, target C, bubble C, bubble B, bubble A");
+
+  g_string_free (str, TRUE);
+
+  gtk_widget_destroy (A);
+}
+
+static void
+test_mixed (void)
+{
+  GtkWidget *A, *B, *C;
+  GString *str;
+
+  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (A, "A");
+  B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_name (B, "B");
+  C = gtk_event_box_new ();
+  gtk_widget_set_hexpand (C, TRUE);
+  gtk_widget_set_vexpand (C, TRUE);
+  gtk_widget_set_name (C, "C");
+
+  gtk_container_add (GTK_CONTAINER (A), B);
+  gtk_container_add (GTK_CONTAINER (B), C);
+
+  gtk_widget_show_all (A);
+
+  str = g_string_new ("");
+
+  add_gesture (A, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+
+  add_legacy (A, str, GDK_EVENT_PROPAGATE);
+  add_legacy (B, str, GDK_EVENT_PROPAGATE);
+  add_legacy (C, str, GDK_EVENT_PROPAGATE);
+
+  inject_press (C);
+
+  g_assert_cmpstr (str->str, ==,
+      "capture A, capture B, capture C, target C, legacy C, bubble C, legacy B, bubble B, legacy A, bubble A");
+
+  g_string_free (str, TRUE);
+
+  gtk_widget_destroy (A);
+}
+
+static void
+test_early_exit (void)
+{
+  GtkWidget *A, *B, *C;
+  GString *str;
+
+  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (A, "A");
+  B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_name (B, "B");
+  C = gtk_event_box_new ();
+  gtk_widget_set_hexpand (C, TRUE);
+  gtk_widget_set_vexpand (C, TRUE);
+  gtk_widget_set_name (C, "C");
+
+  gtk_container_add (GTK_CONTAINER (A), B);
+  gtk_container_add (GTK_CONTAINER (B), C);
+
+  gtk_widget_show_all (A);
+
+  str = g_string_new ("");
+
+  add_gesture (A, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+
+  add_legacy (A, str, GDK_EVENT_PROPAGATE);
+  add_legacy (B, str, GDK_EVENT_STOP);
+  add_legacy (C, str, GDK_EVENT_PROPAGATE);
+
+  inject_press (C);
+
+  g_assert_cmpstr (str->str, ==,
+      "capture A, capture B, capture C, target C, legacy C, bubble C, legacy B");
+
+  g_string_free (str, TRUE);
+
+  gtk_widget_destroy (A);
+}
+
+static void
+test_claim (void)
+{
+  GtkWidget *A, *B, *C;
+  GString *str;
+
+  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (A, "A");
+  B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_name (B, "B");
+  C = gtk_event_box_new ();
+  gtk_widget_set_hexpand (C, TRUE);
+  gtk_widget_set_vexpand (C, TRUE);
+  gtk_widget_set_name (C, "C");
+
+  gtk_container_add (GTK_CONTAINER (A), B);
+  gtk_container_add (GTK_CONTAINER (B), C);
+
+  gtk_widget_show_all (A);
+
+  str = g_string_new ("");
+
+  add_gesture (A, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_CAPTURE, str, GTK_EVENT_SEQUENCE_CLAIMED);
+  add_gesture (A, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_TARGET, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (A, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (B, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+  add_gesture (C, GTK_PHASE_BUBBLE, str, GTK_EVENT_SEQUENCE_NONE);
+
+  inject_press (C);
+
+  g_assert_cmpstr (str->str, ==,
+      "capture A, capture B, capture C");
+
+  g_string_free (str, TRUE);
+
+  gtk_widget_destroy (A);
+}
+
+int
+main (int argc, char *argv[])
+{
+  gtk_test_init (&argc, &argv);
+
+  g_test_add_func ("/gestures/propagation/phases", test_phases);
+  g_test_add_func ("/gestures/propagation/mixed", test_mixed);
+  g_test_add_func ("/gestures/propagation/early-exit", test_early_exit);
+  g_test_add_func ("/gestures/propagation/claim", test_claim);
+
+  return g_test_run ();
+}