diff --git a/ChangeLog b/ChangeLog
index ea9b44f305..a287e314f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-16  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* tests/check/pipelines/stress.c: (GST_START_TEST):
+	Make sure we set the pipeline back to the NULL state before
+	dropping our final reference.
+
 2007-07-16  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* tests/check/elements/tee.c: (GST_START_TEST):
diff --git a/tests/check/pipelines/stress.c b/tests/check/pipelines/stress.c
index 9d63ea5c4d..7d8ddf9ccc 100644
--- a/tests/check/pipelines/stress.c
+++ b/tests/check/pipelines/stress.c
@@ -74,6 +74,7 @@ GST_START_TEST (test_stress_preroll)
     g_main_context_iteration (NULL, TRUE);
   }
 
+  gst_element_set_state (pipeline, GST_STATE_NULL);
   gst_object_unref (pipeline);
 }