diff --git a/tests/check/elements/mxfmux.c b/tests/check/elements/mxfmux.c
index 076496bdb9..6a531606d7 100644
--- a/tests/check/elements/mxfmux.c
+++ b/tests/check/elements/mxfmux.c
@@ -90,8 +90,6 @@ run_test (const gchar * pipeline_string)
 
   g_signal_connect (bus, "message", (GCallback) on_message_cb, &omud);
 
-  gst_object_unref (bus);
-
   ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
   fail_unless (ret == GST_STATE_CHANGE_SUCCESS
       || ret == GST_STATE_CHANGE_ASYNC);
@@ -105,6 +103,8 @@ run_test (const gchar * pipeline_string)
 
   gst_object_unref (pipeline);
   g_main_loop_unref (loop);
+  gst_bus_remove_signal_watch (bus);
+  gst_object_unref (bus);
 }
 
 GST_START_TEST (test_mpeg2)
diff --git a/tests/check/pipelines/mxf.c b/tests/check/pipelines/mxf.c
index 9693bed046..675f446ec3 100644
--- a/tests/check/pipelines/mxf.c
+++ b/tests/check/pipelines/mxf.c
@@ -105,8 +105,6 @@ run_test (const gchar * pipeline_string, gint n_pads_expected)
 
   g_signal_connect (bus, "message", (GCallback) on_message_cb, &omud);
 
-  gst_object_unref (bus);
-
   ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
   fail_unless (ret == GST_STATE_CHANGE_SUCCESS
       || ret == GST_STATE_CHANGE_ASYNC);
@@ -121,6 +119,8 @@ run_test (const gchar * pipeline_string, gint n_pads_expected)
 
   gst_object_unref (pipeline);
   g_main_loop_unref (loop);
+  gst_bus_remove_signal_watch (bus);
+  gst_object_unref (bus);
 }
 
 GST_START_TEST (test_mpeg2)