diff --git a/ChangeLog b/ChangeLog
index a992b6f2c..a350dd1ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-28  Neil Roberts  <neil@linux.intel.com>
+
+	* tests/conform/test-mesh-mutability.c:
+	* tests/conform/test-mesh-interleved.c:
+	* tests/conform/test-mesh-contiguous.c: Remove the idle source
+	after the test is complete so that it won't interfere with other
+	tests.
+
 2008-11-26  Emmanuele Bassi  <ebassi@linux.intel.com>
 
 	* clutter/clutter-group.c:
diff --git a/tests/conform/test-mesh-contiguous.c b/tests/conform/test-mesh-contiguous.c
index f411b755f..b5d940ad7 100644
--- a/tests/conform/test-mesh-contiguous.c
+++ b/tests/conform/test-mesh-contiguous.c
@@ -128,6 +128,7 @@ test_mesh_contiguous (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
   ClutterActor *group;
+  guint idle_source;
 
   state.frame = 0;
 
@@ -145,7 +146,7 @@ test_mesh_contiguous (TestConformSimpleFixture *fixture,
   /* We force continuous redrawing of the stage, since we need to skip
    * the first few frames, and we wont be doing anything else that
    * will trigger redrawing. */
-  g_idle_add (queue_redraw, stage);
+  idle_source = g_idle_add (queue_redraw, stage);
 
   g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
   
@@ -186,6 +187,8 @@ test_mesh_contiguous (TestConformSimpleFixture *fixture,
 
   cogl_mesh_unref (state.mesh);
 
+  g_source_remove (idle_source);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
diff --git a/tests/conform/test-mesh-interleved.c b/tests/conform/test-mesh-interleved.c
index ea4cafdc3..5cd3a2b1b 100644
--- a/tests/conform/test-mesh-interleved.c
+++ b/tests/conform/test-mesh-interleved.c
@@ -99,6 +99,7 @@ test_mesh_interleved (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
   ClutterActor *group;
+  guint idle_source;
 
   state.frame = 0;
 
@@ -116,7 +117,7 @@ test_mesh_interleved (TestConformSimpleFixture *fixture,
   /* We force continuous redrawing of the stage, since we need to skip
    * the first few frames, and we wont be doing anything else that
    * will trigger redrawing. */
-  g_idle_add (queue_redraw, stage);
+  idle_source = g_idle_add (queue_redraw, stage);
 
   g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
   
@@ -164,6 +165,8 @@ test_mesh_interleved (TestConformSimpleFixture *fixture,
 
   cogl_mesh_unref (state.mesh);
 
+  g_source_remove (idle_source);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
diff --git a/tests/conform/test-mesh-mutability.c b/tests/conform/test-mesh-mutability.c
index 08bd88abc..af7ec80f5 100644
--- a/tests/conform/test-mesh-mutability.c
+++ b/tests/conform/test-mesh-mutability.c
@@ -139,6 +139,7 @@ test_mesh_mutability (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
   ClutterActor *group;
+  guint idle_source;
 
   state.frame = 0;
 
@@ -156,7 +157,7 @@ test_mesh_mutability (TestConformSimpleFixture *fixture,
   /* We force continuous redrawing of the stage, since we need to skip
    * the first few frames, and we wont be doing anything else that
    * will trigger redrawing. */
-  g_idle_add (queue_redraw, stage);
+  idle_source = g_idle_add (queue_redraw, stage);
 
   g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
   
@@ -197,6 +198,8 @@ test_mesh_mutability (TestConformSimpleFixture *fixture,
 
   cogl_mesh_unref (state.mesh);
 
+  g_source_remove (idle_source);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }