diff --git a/tests/caps.c b/tests/caps.c
index 214aa131d3..c8a10d63a6 100644
--- a/tests/caps.c
+++ b/tests/caps.c
@@ -122,10 +122,7 @@ main (int argc, char *argv[])
   doc = xmlNewDoc ("1.0");
   doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
 
-  g_thread_init (NULL);
-  gst_typefactory_get_type ();
-  _gst_props_initialize ();
-  _gst_caps_initialize ();
+  gst_init (&argc, &argv);
 
   sinkcaps = mpeg2dec_sink_caps ();
   parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
diff --git a/tests/capsconnect.c b/tests/capsconnect.c
index 6201a7cc79..714e053a72 100644
--- a/tests/capsconnect.c
+++ b/tests/capsconnect.c
@@ -4,7 +4,7 @@ int main(int argc,char *argv[])
 {
   xmlDocPtr doc;
   xmlNodePtr parent;
-  GstElement *mpg123;
+  GstElement *mad;
   GstElement *mp3parse;
   GstElement *queue;
   GstPad *sinkpad;
@@ -16,10 +16,10 @@ int main(int argc,char *argv[])
 
   gst_init (&argc, &argv);
 
-  mpg123 = gst_elementfactory_make ("mpg123", "mpg123");
-  g_assert (mpg123 != NULL);
+  mad = gst_elementfactory_make ("mad", "mad");
+  g_assert (mad != NULL);
 
-  sinkpad = gst_element_get_pad (mpg123, "sink");
+  sinkpad = gst_element_get_pad (mad, "sink");
   g_assert (sinkpad != NULL);
 
   queue = gst_elementfactory_make ("queue", "queue");
@@ -30,7 +30,7 @@ int main(int argc,char *argv[])
   qsinkpad = gst_element_get_pad (queue, "sink");
   g_assert (qsinkpad != NULL);
   
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "mpg123 caps", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "mad caps", NULL);
   gst_caps_save_thyself (gst_pad_get_caps (sinkpad), parent);
 
   parent = xmlNewChild (doc->xmlRootNode, NULL, "queue caps", NULL);
@@ -52,7 +52,7 @@ int main(int argc,char *argv[])
   parent = xmlNewChild (doc->xmlRootNode, NULL, "queue caps after connect sink", NULL);
   gst_caps_save_thyself (gst_pad_get_caps (qsinkpad), parent);
 
-  parent = xmlNewChild (doc->xmlRootNode, NULL, "mpg123 caps after connect sink", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "mad caps after connect sink", NULL);
   gst_caps_save_thyself (gst_pad_get_caps (sinkpad), parent);
 
   xmlDocDump(stdout, doc);
diff --git a/tests/muxing/case1.c b/tests/muxing/case1.c
index ad0418129f..03e223d77b 100644
--- a/tests/muxing/case1.c
+++ b/tests/muxing/case1.c
@@ -28,7 +28,7 @@ main(int argc,char *argv[])
   g_return_val_if_fail (pipeline != NULL, 1);
 
   src = gst_elementfactory_make ("fakesrc", "src");
-  g_object_set (G_OBJECT (src), "num_buffers", 4, NULL);
+  g_object_set (G_OBJECT (src), "num_buffers", 40, NULL);
   g_return_val_if_fail (src != NULL, 2);
   tee = gst_elementfactory_make ("tee", "tee");
   g_return_val_if_fail (tee != NULL, 3);
@@ -39,7 +39,7 @@ main(int argc,char *argv[])
   g_object_set (G_OBJECT (identity2), "loop_based", TRUE, NULL);
   g_return_val_if_fail (identity2 != NULL, 3);
   aggregator = gst_elementfactory_make ("aggregator", "aggregator");
-  g_object_set (G_OBJECT (aggregator), "sched", 3, NULL);
+  g_object_set (G_OBJECT (aggregator), "sched", 4, NULL);
   g_return_val_if_fail (aggregator != NULL, 3);
   sink = gst_elementfactory_make ("fakesink", "sink");
   g_return_val_if_fail (sink != NULL, 4);
@@ -69,8 +69,7 @@ main(int argc,char *argv[])
 
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
 
-  while (playing)
-    gst_bin_iterate (pipeline);
+  while (gst_bin_iterate (pipeline));
 
   gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);