diff --git a/ChangeLog b/ChangeLog
index c242b9535..e59911efb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-18  Neil Roberts  <neil@linux.intel.com>
+
+	* tests/conform/test-timeline.c (test_timeline): Remove the delay
+	idle handler after the test is finished, otherwise it will
+	continue running during subsequent tests. This was breaking
+	test_timeline_interpolate.
+
 2008-11-18  Robert Bragg  <robert@linux.intel.com>
 	
 	* clutter/cogl/common/cogl-mesh.c:
diff --git a/tests/conform/test-timeline.c b/tests/conform/test-timeline.c
index b8a063523..1e6ab6258 100644
--- a/tests/conform/test-timeline.c
+++ b/tests/conform/test-timeline.c
@@ -185,6 +185,7 @@ test_timeline (TestConformSimpleFixture *fixture,
   gchar **markers;
   gsize n_markers;
   gboolean pass = TRUE;
+  guint delay_tag;
 
   timeline_data_init (&data_1, 1);
   timeline_1 = clutter_timeline_new (FRAME_COUNT, 30);
@@ -279,7 +280,7 @@ test_timeline (TestConformSimpleFixture *fixture,
   clutter_timeline_start (timeline_3);
 
   clutter_threads_add_timeout (2000, timeout_cb, NULL);
-  clutter_threads_add_timeout (99, delay_cb, NULL);
+  delay_tag = clutter_threads_add_timeout (99, delay_cb, NULL);
 
   clutter_main ();
 
@@ -298,6 +299,8 @@ test_timeline (TestConformSimpleFixture *fixture,
   timeline_data_destroy (&data_2);
   timeline_data_destroy (&data_3);
 
+  g_source_remove (delay_tag);
+
   if (g_test_verbose ())
     g_print ("Overall result: %s\n", pass == TRUE ? "PASS" : "FAIL");