diff --git a/tests/check/generic/libavcodec-locking.c b/tests/check/generic/libavcodec-locking.c
index 5990941e76..a6dfb8e29d 100644
--- a/tests/check/generic/libavcodec-locking.c
+++ b/tests/check/generic/libavcodec-locking.c
@@ -158,21 +158,4 @@ simple_launch_lines_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  SRunner *sr;
-  Suite *s;
-  int nf;
-
-  gst_check_init (&argc, &argv);
-
-  s = simple_launch_lines_suite ();
-  sr = srunner_create (s);
-
-  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/generic/plugin-test.c b/tests/check/generic/plugin-test.c
index e1bfdefe91..53831d249b 100644
--- a/tests/check/generic/plugin-test.c
+++ b/tests/check/generic/plugin-test.c
@@ -95,21 +95,4 @@ plugin_test_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  SRunner *sr;
-  Suite *s;
-  int nf;
-
-  gst_check_init (&argc, &argv);
-
-  s = plugin_test_suite ();
-  sr = srunner_create (s);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (plugin_test);