diff --git a/ChangeLog b/ChangeLog
index b1a1f1edc5..0993fb2615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tests/Makefile.am: Skip crossingevents test when
+	running make check, since it doesn't work on a naked
+	X server.
+
 2008-08-05  Tor Lillqvist  <tml@novell.com>
 
 	Bug 544684 - Win64 issue, window handles are assumed to be 32-bit
diff --git a/gtk/tests/crossingevents.c b/gtk/tests/crossingevents.c
index 45d6197b86..55eaaf3ce2 100644
--- a/gtk/tests/crossingevents.c
+++ b/gtk/tests/crossingevents.c
@@ -266,8 +266,11 @@ check_event (CrossingTest *test,
   g_assert (evt->mode == mode);
 
   if (evt->detail != detail)
-    g_print ("detail, evt %d vs %d\n", evt->detail, detail);
-
+    g_print ("%s %s event, detail %d, expected detail %d\n", 
+             synthesized ? "synthesized" : "native",
+             entered ? "enter" : "leave",
+             evt->detail, detail);
+ 
   g_assert (evt->detail == detail);
 }