diff --git a/ChangeLog b/ChangeLog
index 6731d1e32c..0d13ffd728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2006-07-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* tests/check/elements/fakesink.c:
+	* tests/check/elements/fakesrc.c:
+	* tests/check/elements/fdsrc.c:
+	* tests/check/elements/identity.c:
+	* tests/check/generic/sinks.c: (gst_sinks_suite):
+	* tests/check/generic/states.c:
+	* tests/check/gst/gst.c:
+	* tests/check/gst/gstabi.c:
+	* tests/check/gst/gstbin.c:
+	* tests/check/gst/gstbuffer.c: (gst_buffer_suite):
+	* tests/check/gst/gstbus.c: (gst_bus_suite):
+	* tests/check/gst/gstcaps.c: (GST_START_TEST):
+	* tests/check/gst/gstelement.c:
+	* tests/check/gst/gstevent.c: (gst_event_suite):
+	* tests/check/gst/gstghostpad.c:
+	* tests/check/gst/gstiterator.c: (gst_iterator_suite):
+	* tests/check/gst/gstmessage.c: (gst_message_suite):
+	* tests/check/gst/gstminiobject.c:
+	* tests/check/gst/gstobject.c:
+	* tests/check/gst/gstpad.c:
+	* tests/check/gst/gstpipeline.c:
+	* tests/check/gst/gstplugin.c:
+	* tests/check/gst/gstquery.c: (gst_query_suite):
+	* tests/check/gst/gstsegment.c: (gst_segment_suite):
+	* tests/check/gst/gststructure.c:
+	* tests/check/gst/gstsystemclock.c:
+	* tests/check/gst/gsttag.c:
+	* tests/check/gst/gsttask.c: (gst_task_suite):
+	* tests/check/gst/gstutils.c:
+	* tests/check/gst/gstvalue.c:
+	* tests/check/libs/adapter.c:
+	* tests/check/libs/basesrc.c:
+	* tests/check/libs/collectpads.c:
+	* tests/check/libs/controller.c:
+	* tests/check/libs/gdp.c: (gst_dp_suite):
+	* tests/check/libs/gstnetclientclock.c:
+	* tests/check/libs/gstnettimeprovider.c:
+	* tests/check/libs/libsabi.c: (libsabi_suite):
+	* tests/check/libs/typefindhelper.c:
+	* tests/check/pipelines/cleanup.c:
+	* tests/check/pipelines/parse-launch.c:
+	* tests/check/pipelines/simple-launch-lines.c:
+	* tests/check/pipelines/stress.c: (stress_suite):
+	  use the new macro
+
 2006-07-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* libs/gst/check/gstcheck.c: (gst_check_run_suite):
diff --git a/tests/check/elements/fakesink.c b/tests/check/elements/fakesink.c
index 0ca1a5203c..d7d60ff515 100644
--- a/tests/check/elements/fakesink.c
+++ b/tests/check/elements/fakesink.c
@@ -305,19 +305,4 @@ fakesink_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = fakesink_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (fakesink);
diff --git a/tests/check/elements/fakesrc.c b/tests/check/elements/fakesrc.c
index d2c6c822be..657d917f53 100644
--- a/tests/check/elements/fakesrc.c
+++ b/tests/check/elements/fakesrc.c
@@ -255,19 +255,4 @@ fakesrc_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = fakesrc_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (fakesrc);
diff --git a/tests/check/elements/fdsrc.c b/tests/check/elements/fdsrc.c
index ef748fc96f..412e477d02 100644
--- a/tests/check/elements/fdsrc.c
+++ b/tests/check/elements/fdsrc.c
@@ -193,19 +193,4 @@ fdsrc_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = fdsrc_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (fdsrc);
diff --git a/tests/check/elements/identity.c b/tests/check/elements/identity.c
index af3c6d3e57..9e34c35998 100644
--- a/tests/check/elements/identity.c
+++ b/tests/check/elements/identity.c
@@ -120,19 +120,4 @@ identity_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = identity_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (identity);
diff --git a/tests/check/generic/sinks.c b/tests/check/generic/sinks.c
index ce1ab24f16..7cf5bea4c9 100644
--- a/tests/check/generic/sinks.c
+++ b/tests/check/generic/sinks.c
@@ -452,7 +452,7 @@ GST_END_TEST;
 
 /* test: try changing state of sinks */
 Suite *
-gst_object_suite (void)
+gst_sinks_suite (void)
 {
   Suite *s = suite_create ("Sinks");
   TCase *tc_chain = tcase_create ("general");
@@ -469,19 +469,4 @@ gst_object_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_object_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_sinks);
diff --git a/tests/check/generic/states.c b/tests/check/generic/states.c
index 56fd38f089..30a6ea69df 100644
--- a/tests/check/generic/states.c
+++ b/tests/check/generic/states.c
@@ -76,19 +76,4 @@ states_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = states_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (states);
diff --git a/tests/check/gst/gst.c b/tests/check/gst/gst.c
index 76e37ce36c..d2dda67eee 100644
--- a/tests/check/gst/gst.c
+++ b/tests/check/gst/gst.c
@@ -93,19 +93,4 @@ gst_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst);
diff --git a/tests/check/gst/gstabi.c b/tests/check/gst/gstabi.c
index fd81020560..5aff05d0c6 100644
--- a/tests/check/gst/gstabi.c
+++ b/tests/check/gst/gstabi.c
@@ -61,19 +61,4 @@ gstabi_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstabi_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gstabi);
diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c
index e404516029..e2e1a0c1f8 100644
--- a/tests/check/gst/gstbin.c
+++ b/tests/check/gst/gstbin.c
@@ -808,19 +808,4 @@ gst_bin_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_bin_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_bin);
diff --git a/tests/check/gst/gstbuffer.c b/tests/check/gst/gstbuffer.c
index 632ba3923f..20c0fb89bf 100644
--- a/tests/check/gst/gstbuffer.c
+++ b/tests/check/gst/gstbuffer.c
@@ -318,7 +318,7 @@ GST_START_TEST (test_metadata_writable)
 GST_END_TEST;
 
 Suite *
-gst_test_suite (void)
+gst_buffer_suite (void)
 {
   Suite *s = suite_create ("GstBuffer");
   TCase *tc_chain = tcase_create ("general");
@@ -334,19 +334,4 @@ gst_test_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_test_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_buffer);
diff --git a/tests/check/gst/gstbus.c b/tests/check/gst/gstbus.c
index 34199f24ba..9df63c2425 100644
--- a/tests/check/gst/gstbus.c
+++ b/tests/check/gst/gstbus.c
@@ -230,8 +230,11 @@ GST_START_TEST (test_watch_with_poll)
 
   gst_object_unref (test_bus);
 }
-GST_END_TEST Suite *
-gstbus_suite (void)
+
+GST_END_TEST;
+
+Suite *
+gst_bus_suite (void)
 {
   Suite *s = suite_create ("GstBus");
   TCase *tc_chain = tcase_create ("stresstest");
@@ -245,19 +248,4 @@ gstbus_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstbus_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_bus);
diff --git a/tests/check/gst/gstcaps.c b/tests/check/gst/gstcaps.c
index ca00ae9e4b..8bb73db178 100644
--- a/tests/check/gst/gstcaps.c
+++ b/tests/check/gst/gstcaps.c
@@ -41,6 +41,7 @@ GST_START_TEST (test_from_string)
     caps2 = gst_caps_from_string (caps_list[i]);
     fail_if (caps2 == NULL, "Could not create caps from string %s\n", to_str);
 
+    fail_unless (gst_caps_is_equal (caps, caps));
     fail_unless (gst_caps_is_equal (caps, caps2));
 
     gst_caps_unref (caps);
@@ -348,19 +349,4 @@ gst_caps_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_caps_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_caps);
diff --git a/tests/check/gst/gstelement.c b/tests/check/gst/gstelement.c
index 65dc1f9000..9ff576dfd6 100644
--- a/tests/check/gst/gstelement.c
+++ b/tests/check/gst/gstelement.c
@@ -217,19 +217,4 @@ gst_element_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_element_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_element);
diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c
index bd6052d7e0..b128b890ac 100644
--- a/tests/check/gst/gstevent.c
+++ b/tests/check/gst/gstevent.c
@@ -419,7 +419,7 @@ GST_START_TEST (send_custom_events)
 GST_END_TEST;
 
 Suite *
-gstevents_suite (void)
+gst_event_suite (void)
 {
   Suite *s = suite_create ("GstEvent");
   TCase *tc_chain = tcase_create ("customevents");
@@ -432,19 +432,4 @@ gstevents_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstevents_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_event);
diff --git a/tests/check/gst/gstghostpad.c b/tests/check/gst/gstghostpad.c
index e423e4d398..2ab4247376 100644
--- a/tests/check/gst/gstghostpad.c
+++ b/tests/check/gst/gstghostpad.c
@@ -498,19 +498,4 @@ gst_ghost_pad_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_ghost_pad_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_ghost_pad);
diff --git a/tests/check/gst/gstiterator.c b/tests/check/gst/gstiterator.c
index 720114b260..288f0cdfcc 100644
--- a/tests/check/gst/gstiterator.c
+++ b/tests/check/gst/gstiterator.c
@@ -168,7 +168,7 @@ GST_START_TEST (test_fold)
 GST_END_TEST;
 
 Suite *
-gstiterator_suite (void)
+gst_iterator_suite (void)
 {
   Suite *s = suite_create ("GstIterator");
   TCase *tc_chain = tcase_create ("correctness");
@@ -182,19 +182,4 @@ gstiterator_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstiterator_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_iterator);
diff --git a/tests/check/gst/gstmessage.c b/tests/check/gst/gstmessage.c
index a96711340e..20a2e2b32b 100644
--- a/tests/check/gst/gstmessage.c
+++ b/tests/check/gst/gstmessage.c
@@ -190,8 +190,10 @@ GST_START_TEST (test_parsing)
 
 }
 
-GST_END_TEST Suite *
-gst_data_suite (void)
+GST_END_TEST;
+
+Suite *
+gst_message_suite (void)
 {
   Suite *s = suite_create ("GstMessage");
   TCase *tc_chain = tcase_create ("general");
@@ -202,19 +204,4 @@ gst_data_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_data_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_message);
diff --git a/tests/check/gst/gstminiobject.c b/tests/check/gst/gstminiobject.c
index d57ada3c9d..33a2bb3346 100644
--- a/tests/check/gst/gstminiobject.c
+++ b/tests/check/gst/gstminiobject.c
@@ -289,19 +289,4 @@ gst_mini_object_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_mini_object_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_mini_object);
diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c
index dc5ec1ba46..d9a9d94945 100644
--- a/tests/check/gst/gstobject.c
+++ b/tests/check/gst/gstobject.c
@@ -457,19 +457,4 @@ GST_END_TEST
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_object_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_object);
diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c
index 258c7ccfee..dd3c6023c9 100644
--- a/tests/check/gst/gstpad.c
+++ b/tests/check/gst/gstpad.c
@@ -464,19 +464,4 @@ gst_pad_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_pad_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_pad);
diff --git a/tests/check/gst/gstpipeline.c b/tests/check/gst/gstpipeline.c
index 99d58ca148..b009686bd1 100644
--- a/tests/check/gst/gstpipeline.c
+++ b/tests/check/gst/gstpipeline.c
@@ -506,20 +506,4 @@ gst_pipeline_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_pipeline_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_set_log (sr, "test.log");
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_pipeline);
diff --git a/tests/check/gst/gstplugin.c b/tests/check/gst/gstplugin.c
index 5a700c0578..d645732a7c 100644
--- a/tests/check/gst/gstplugin.c
+++ b/tests/check/gst/gstplugin.c
@@ -313,19 +313,4 @@ gst_plugin_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_plugin_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_plugin);
diff --git a/tests/check/gst/gstquery.c b/tests/check/gst/gstquery.c
index 421add556d..51902e019b 100644
--- a/tests/check/gst/gstquery.c
+++ b/tests/check/gst/gstquery.c
@@ -1,7 +1,4 @@
 /* GStreamer
- * Copyright (C) 2005 Jan Schmidt <thaytan@mad.scientist.com>
- *
- * gstevent.c: Unit test for event handling
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -219,7 +216,7 @@ GST_START_TEST (test_queries)
 GST_END_TEST;
 
 Suite *
-gstquery_suite (void)
+gst_query_suite (void)
 {
   Suite *s = suite_create ("GstQuery");
   TCase *tc_chain = tcase_create ("queries");
@@ -232,19 +229,4 @@ gstquery_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstquery_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_query);
diff --git a/tests/check/gst/gstsegment.c b/tests/check/gst/gstsegment.c
index 0e9b671996..21c8ddbdd2 100644
--- a/tests/check/gst/gstsegment.c
+++ b/tests/check/gst/gstsegment.c
@@ -1272,7 +1272,7 @@ GST_START_TEST (segment_newsegment_runningtime)
 GST_END_TEST;
 
 Suite *
-gstsegments_suite (void)
+gst_segment_suite (void)
 {
   Suite *s = suite_create ("GstSegment");
   TCase *tc_chain = tcase_create ("segments");
@@ -1293,19 +1293,4 @@ gstsegments_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstsegments_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_segment);
diff --git a/tests/check/gst/gststructure.c b/tests/check/gst/gststructure.c
index 70927e19c5..0601302ce8 100644
--- a/tests/check/gst/gststructure.c
+++ b/tests/check/gst/gststructure.c
@@ -157,19 +157,4 @@ gst_structure_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_structure_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_structure);
diff --git a/tests/check/gst/gstsystemclock.c b/tests/check/gst/gstsystemclock.c
index 1e79ff9f22..059ddd01c1 100644
--- a/tests/check/gst/gstsystemclock.c
+++ b/tests/check/gst/gstsystemclock.c
@@ -203,7 +203,8 @@ GST_START_TEST (test_diff)
     fail_if (d[i] != GST_CLOCK_DIFF (time1[i], time2[i]));
   }
 }
-GST_END_TEST Suite * gst_systemclock_suite (void)
+GST_END_TEST Suite *
+gst_systemclock_suite (void)
 {
   Suite *s = suite_create ("GstSystemClock");
   TCase *tc_chain = tcase_create ("waiting");
@@ -217,19 +218,4 @@ GST_END_TEST Suite * gst_systemclock_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_systemclock_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_systemclock);
diff --git a/tests/check/gst/gsttag.c b/tests/check/gst/gsttag.c
index ab32b48d75..efc4e23bbe 100644
--- a/tests/check/gst/gsttag.c
+++ b/tests/check/gst/gsttag.c
@@ -1,8 +1,6 @@
 /*
  * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
  *
- * parse1.c: Test various parsing stuff
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
@@ -214,7 +212,10 @@ GST_START_TEST (test_date_tags)
   gst_tag_list_free (tag_list);
   g_date_free (date);
 }
-GST_END_TEST Suite *
+
+GST_END_TEST;
+
+Suite *
 gst_tag_suite (void)
 {
   Suite *s = suite_create ("GstTag");
@@ -227,19 +228,4 @@ gst_tag_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_tag_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_tag);
diff --git a/tests/check/gst/gsttask.c b/tests/check/gst/gsttask.c
index b27af9f527..9cfe206ff3 100644
--- a/tests/check/gst/gsttask.c
+++ b/tests/check/gst/gsttask.c
@@ -185,7 +185,7 @@ GST_END_TEST;
 
 
 Suite *
-gst_element_suite (void)
+gst_task_suite (void)
 {
   Suite *s = suite_create ("GstTask");
   TCase *tc_chain = tcase_create ("task tests");
@@ -200,19 +200,4 @@ gst_element_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_element_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_task);
diff --git a/tests/check/gst/gstutils.c b/tests/check/gst/gstutils.c
index c5e934d7b4..e869d37252 100644
--- a/tests/check/gst/gstutils.c
+++ b/tests/check/gst/gstutils.c
@@ -469,19 +469,4 @@ gst_utils_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_utils_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_utils);
diff --git a/tests/check/gst/gstvalue.c b/tests/check/gst/gstvalue.c
index 0d520a7127..efb1bcb424 100644
--- a/tests/check/gst/gstvalue.c
+++ b/tests/check/gst/gstvalue.c
@@ -1511,19 +1511,4 @@ gst_value_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_value_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_value);
diff --git a/tests/check/libs/adapter.c b/tests/check/libs/adapter.c
index 80d8e70e20..2fe65731be 100644
--- a/tests/check/libs/adapter.c
+++ b/tests/check/libs/adapter.c
@@ -188,19 +188,4 @@ gst_adapter_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_adapter_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_adapter);
diff --git a/tests/check/libs/basesrc.c b/tests/check/libs/basesrc.c
index c1f9989f1d..77a022d1b9 100644
--- a/tests/check/libs/basesrc.c
+++ b/tests/check/libs/basesrc.c
@@ -343,19 +343,4 @@ gst_basesrc_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_basesrc_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_basesrc);
diff --git a/tests/check/libs/collectpads.c b/tests/check/libs/collectpads.c
index 4dd33a8675..310fbbbe7b 100644
--- a/tests/check/libs/collectpads.c
+++ b/tests/check/libs/collectpads.c
@@ -345,19 +345,4 @@ gst_collect_pads_suite ()
   return suite;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *suite = gst_collect_pads_suite ();
-  SRunner *runner = srunner_create (suite);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (runner, CK_NORMAL);
-  nf = srunner_ntests_failed (runner);
-  srunner_free (runner);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_collect_pads);
diff --git a/tests/check/libs/controller.c b/tests/check/libs/controller.c
index 2fcece6408..f6a05930af 100644
--- a/tests/check/libs/controller.c
+++ b/tests/check/libs/controller.c
@@ -786,20 +786,4 @@ gst_controller_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_controller_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-  gst_controller_init (NULL, NULL);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_controller);
diff --git a/tests/check/libs/gdp.c b/tests/check/libs/gdp.c
index ea85b90c2c..ca0e80bed7 100644
--- a/tests/check/libs/gdp.c
+++ b/tests/check/libs/gdp.c
@@ -279,7 +279,7 @@ GST_START_TEST (test_event)
 GST_END_TEST;
 
 Suite *
-gst_data_protocol_suite (void)
+gst_dp_suite (void)
 {
   Suite *s = suite_create ("data protocol");
   TCase *tc_chain = tcase_create ("general");
@@ -293,20 +293,4 @@ gst_data_protocol_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_data_protocol_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-  gst_dp_init ();
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_dp);
diff --git a/tests/check/libs/gstnetclientclock.c b/tests/check/libs/gstnetclientclock.c
index 8ff6bc49e7..2deb924757 100644
--- a/tests/check/libs/gstnetclientclock.c
+++ b/tests/check/libs/gstnetclientclock.c
@@ -125,19 +125,4 @@ gst_net_client_clock_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_net_client_clock_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_net_client_clock);
diff --git a/tests/check/libs/gstnettimeprovider.c b/tests/check/libs/gstnettimeprovider.c
index e0008da115..e0476a3725 100644
--- a/tests/check/libs/gstnettimeprovider.c
+++ b/tests/check/libs/gstnettimeprovider.c
@@ -122,19 +122,4 @@ gst_net_time_provider_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_net_time_provider_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_net_time_provider);
diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c
index e18167ec14..e34600d350 100644
--- a/tests/check/libs/libsabi.c
+++ b/tests/check/libs/libsabi.c
@@ -1,7 +1,7 @@
 /* GStreamer
  * Copyright (C) 2005 Wim Taymans <wim@fluendo.com>
  *
- * gstabi.c: Unit test for ABI compatibility
+ * libsabi.c: Unit test for ABI compatibility
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -62,7 +62,7 @@ GST_START_TEST (test_ABI)
 GST_END_TEST;
 
 Suite *
-gstabi_suite (void)
+libsabi_suite (void)
 {
   Suite *s = suite_create ("LibsABI");
   TCase *tc_chain = tcase_create ("size check");
@@ -74,19 +74,4 @@ gstabi_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gstabi_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (libsabi);
diff --git a/tests/check/libs/typefindhelper.c b/tests/check/libs/typefindhelper.c
index b6fdb93668..29e5447e01 100644
--- a/tests/check/libs/typefindhelper.c
+++ b/tests/check/libs/typefindhelper.c
@@ -77,22 +77,7 @@ gst_typefindhelper_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = gst_typefindhelper_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (gst_typefindhelper);
 
 static void
 foobar_typefind (GstTypeFind * tf, gpointer unused)
diff --git a/tests/check/pipelines/cleanup.c b/tests/check/pipelines/cleanup.c
index b268e461b1..ca7f19a6a0 100644
--- a/tests/check/pipelines/cleanup.c
+++ b/tests/check/pipelines/cleanup.c
@@ -114,19 +114,4 @@ cleanup_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = cleanup_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (cleanup);
diff --git a/tests/check/pipelines/parse-launch.c b/tests/check/pipelines/parse-launch.c
index b9b593b544..b2f344462b 100644
--- a/tests/check/pipelines/parse-launch.c
+++ b/tests/check/pipelines/parse-launch.c
@@ -270,19 +270,4 @@ parse_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = parse_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (parse);
diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c
index 540f9ad15c..098c8304e9 100644
--- a/tests/check/pipelines/simple-launch-lines.c
+++ b/tests/check/pipelines/simple-launch-lines.c
@@ -221,19 +221,4 @@ simple_launch_lines_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = simple_launch_lines_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (simple_launch_lines);
diff --git a/tests/check/pipelines/stress.c b/tests/check/pipelines/stress.c
index aff1f10f9e..0116685f9b 100644
--- a/tests/check/pipelines/stress.c
+++ b/tests/check/pipelines/stress.c
@@ -1,8 +1,6 @@
 /* GStreamer
  * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
  *
- * simple_launch_lines.c: Unit test for simple pipelines
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ -56,8 +54,10 @@ GST_START_TEST (test_stress)
   gst_object_unref (pipeline);
 }
 
-GST_END_TEST Suite *
-simple_launch_lines_suite (void)
+GST_END_TEST;
+
+Suite *
+stress_suite (void)
 {
   Suite *s = suite_create ("stress");
   TCase *tc_chain = tcase_create ("linear");
@@ -70,19 +70,4 @@ simple_launch_lines_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = simple_launch_lines_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (stress);