diff --git a/ChangeLog b/ChangeLog
index d9bf0447f..9c5832273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-09  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* tests/test-events.c (input_cb):
+	* tests/test-text.c (main): Fix compiler errors. (#592,
+	Gwenole Beauchesne)
+
 2007-12-09  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-actor.c: Document the values for full
diff --git a/tests/test-events.c b/tests/test-events.c
index a286ce545..ae5a03ad8 100644
--- a/tests/test-events.c
+++ b/tests/test-events.c
@@ -142,7 +142,7 @@ input_cb (ClutterActor    *actor,
       printf("[%s] DELETE", source);
       break;
     case CLUTTER_NOTHING:
-      return;
+      return FALSE;
     }
 
   if (clutter_event_get_source (event) == actor)
diff --git a/tests/test-text.c b/tests/test-text.c
index 588b43746..e1db83910 100644
--- a/tests/test-text.c
+++ b/tests/test-text.c
@@ -1,5 +1,8 @@
 #include <clutter/clutter.h>
 
+#include <stdlib.h>
+#include <string.h>
+
 #define STAGE_WIDTH  640
 #define STAGE_HEIGHT 480
 
@@ -10,8 +13,6 @@ int
 main (int argc, char *argv[])
 {
   ClutterActor    *stage;
-  gchar           *text;
-  gsize            size;
   ClutterColor     stage_color = { 0x00, 0x00, 0x00, 0xff };
   ClutterColor     label_color = { 0xff, 0xff, 0xff, 0xff };
 
@@ -22,18 +23,16 @@ main (int argc, char *argv[])
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
   {
-    gint    font_size;
-    gdouble scale;
-    gint    row, col;
+    gint row, col;
 
     for (row=0; row<ROWS; row++)
       for (col=0; col<COLS; col++)
         {
-          ClutterActor    *label;
+          ClutterActor *label;
           gchar font_name[64];
           gchar text[64];
-          gint    font_size = row+10;
-          gdouble scale = 0.17 + (1.5*col/COLS);
+          gint  font_size = row+10;
+          gdouble scale = 0.17 + (1.5 * col / COLS);
 
           sprintf (font_name, "Sans %ipx", font_size);
           sprintf (text, "OH");
@@ -49,8 +48,8 @@ main (int argc, char *argv[])
             {
               sprintf (font_name, "Sans 10px");
               sprintf (text, "%ipx", font_size);
-              if (row==0)
-                sprintf (text, "");
+              if (row == 0)
+                strcpy (text, "");
               font_size = 10;
               scale = 1.0;
             }