diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 6bc4b3690a..98481331a0 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -656,6 +656,7 @@ create_calendar(void)
   gtk_window_set_default_widget (GTK_WINDOW (window), button);
 
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 0);
+  g_signal_connect (window, "close-request", G_CALLBACK (gtk_main_quit), NULL);
   gtk_widget_show (window);
 }