diff --git a/ChangeLog b/ChangeLog
index 26a3cbbbe3..0eba8d0812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/cleanup/cleanup1.c: (create_pipeline):
+	* testsuite/cleanup/cleanup2.c: (create_pipeline):
+	* testsuite/cleanup/cleanup4.c: (main):
+	  fix testsuite
+
 2004-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* libs/gst/control/control.c:
diff --git a/tests/old/testsuite/cleanup/cleanup1.c b/tests/old/testsuite/cleanup/cleanup1.c
index f888b9a0be..2df2ea3d34 100644
--- a/tests/old/testsuite/cleanup/cleanup1.c
+++ b/tests/old/testsuite/cleanup/cleanup1.c
@@ -12,10 +12,10 @@ create_pipeline (void)
   fakesrc = gst_element_factory_make ("fakesrc", "fakesrc");
   fakesink = gst_element_factory_make ("fakesink", "fakesink");
 
-  gst_element_link (fakesrc, fakesink);
-
   gst_bin_add_many (GST_BIN (pipeline), fakesrc, fakesink, NULL);
 
+  gst_element_link (fakesrc, fakesink);
+
   g_object_set (G_OBJECT (fakesrc), "num_buffers", 5, NULL);
 
   return pipeline;
diff --git a/tests/old/testsuite/cleanup/cleanup2.c b/tests/old/testsuite/cleanup/cleanup2.c
index 3d14b5abfb..bd99abd3ba 100644
--- a/tests/old/testsuite/cleanup/cleanup2.c
+++ b/tests/old/testsuite/cleanup/cleanup2.c
@@ -16,10 +16,10 @@ create_pipeline (void)
   gst_element_add_ghost_pad (bin, gst_element_get_pad (fakesink, "sink"),
       "sink");
 
-  gst_element_link (fakesrc, bin);
-
   gst_bin_add_many (GST_BIN (pipeline), fakesrc, bin, NULL);
 
+  gst_element_link (fakesrc, bin);
+
   g_object_set (G_OBJECT (fakesrc), "num_buffers", 5, NULL);
 
   return pipeline;
diff --git a/tests/old/testsuite/cleanup/cleanup4.c b/tests/old/testsuite/cleanup/cleanup4.c
index 0bdc99726f..a82b3f9a68 100644
--- a/tests/old/testsuite/cleanup/cleanup4.c
+++ b/tests/old/testsuite/cleanup/cleanup4.c
@@ -30,11 +30,11 @@ main (gint argc, gchar * argv[])
 
     fakesink = gst_element_factory_make ("fakesink", "fakesink");
 
-    gst_element_link (fakesrc, fakesink);
-
     gst_bin_add (GST_BIN (bin), fakesink);
     gst_bin_add (GST_BIN (pipeline), bin);
 
+    gst_element_link (fakesrc, fakesink);
+
     gst_element_set_state (pipeline, GST_STATE_PLAYING);
 
     while (gst_bin_iterate (GST_BIN (pipeline)));
diff --git a/testsuite/cleanup/cleanup1.c b/testsuite/cleanup/cleanup1.c
index f888b9a0be..2df2ea3d34 100644
--- a/testsuite/cleanup/cleanup1.c
+++ b/testsuite/cleanup/cleanup1.c
@@ -12,10 +12,10 @@ create_pipeline (void)
   fakesrc = gst_element_factory_make ("fakesrc", "fakesrc");
   fakesink = gst_element_factory_make ("fakesink", "fakesink");
 
-  gst_element_link (fakesrc, fakesink);
-
   gst_bin_add_many (GST_BIN (pipeline), fakesrc, fakesink, NULL);
 
+  gst_element_link (fakesrc, fakesink);
+
   g_object_set (G_OBJECT (fakesrc), "num_buffers", 5, NULL);
 
   return pipeline;
diff --git a/testsuite/cleanup/cleanup2.c b/testsuite/cleanup/cleanup2.c
index 3d14b5abfb..bd99abd3ba 100644
--- a/testsuite/cleanup/cleanup2.c
+++ b/testsuite/cleanup/cleanup2.c
@@ -16,10 +16,10 @@ create_pipeline (void)
   gst_element_add_ghost_pad (bin, gst_element_get_pad (fakesink, "sink"),
       "sink");
 
-  gst_element_link (fakesrc, bin);
-
   gst_bin_add_many (GST_BIN (pipeline), fakesrc, bin, NULL);
 
+  gst_element_link (fakesrc, bin);
+
   g_object_set (G_OBJECT (fakesrc), "num_buffers", 5, NULL);
 
   return pipeline;
diff --git a/testsuite/cleanup/cleanup4.c b/testsuite/cleanup/cleanup4.c
index 0bdc99726f..a82b3f9a68 100644
--- a/testsuite/cleanup/cleanup4.c
+++ b/testsuite/cleanup/cleanup4.c
@@ -30,11 +30,11 @@ main (gint argc, gchar * argv[])
 
     fakesink = gst_element_factory_make ("fakesink", "fakesink");
 
-    gst_element_link (fakesrc, fakesink);
-
     gst_bin_add (GST_BIN (bin), fakesink);
     gst_bin_add (GST_BIN (pipeline), bin);
 
+    gst_element_link (fakesrc, fakesink);
+
     gst_element_set_state (pipeline, GST_STATE_PLAYING);
 
     while (gst_bin_iterate (GST_BIN (pipeline)));