diff --git a/ChangeLog b/ChangeLog
index 363da566b..0b89dd4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-22  Neil Roberts  <neil@linux.intel.com>
+
+	* tests/test-unproject.c (on_event): 
+	* tests/test-project.c (on_event): Use a return value for the
+	'event' signal handler, otherwise it might accidentally return
+	TRUE for unhandled events and you won't be able to close the
+	window.
+
 2008-09-19  Emmanuele Bassi  <ebassi@linux.intel.com>
 
 	Bug 1033 - Manually parsing command line options prevents
diff --git a/tests/test-project.c b/tests/test-project.c
index 1ad01e8f8..d0c16ede1 100644
--- a/tests/test-project.c
+++ b/tests/test-project.c
@@ -93,8 +93,7 @@ find_handle_index (ClutterActor * a)
     return -1;
 }
 
-
-void 
+gboolean
 on_event (ClutterStage *stage,
 	  ClutterEvent *event,
 	  gpointer      user_data)
@@ -198,6 +197,8 @@ on_event (ClutterStage *stage,
     default:
       break;
     }
+
+  return FALSE;
 }
 
 
diff --git a/tests/test-unproject.c b/tests/test-unproject.c
index 5128e11dd..617ea60af 100644
--- a/tests/test-unproject.c
+++ b/tests/test-unproject.c
@@ -11,7 +11,7 @@ ClutterActor *label;
 #define RECT_W 320
 #define RECT_H 240
 
-void
+gboolean
 on_event (ClutterStage *stage,
 	  ClutterEvent *event,
 	  gpointer      user_data)
@@ -63,6 +63,8 @@ on_event (ClutterStage *stage,
     default:
       break;
     }
+
+  return FALSE;
 }