diff --git a/tests/old/testsuite/test_gst_init.c b/tests/old/testsuite/test_gst_init.c
index fd604e7414..1749328509 100644
--- a/tests/old/testsuite/test_gst_init.c
+++ b/tests/old/testsuite/test_gst_init.c
@@ -1,7 +1,13 @@
 #include <gst/gst.h>
 
+/* This tests that gst_init() doesn't segfault when passed two NULLs as
+ * parameters, and that it doesn't fail if gst_init() happens to get called
+ * a second time. */
 int
 main (int argc, char *argv[])
 {
-  gst_init(&argc,&argv);
+  gst_init(NULL, NULL);
+  gst_init(&argc, &argv);
+
+  return 0;
 }
diff --git a/testsuite/test_gst_init.c b/testsuite/test_gst_init.c
index fd604e7414..1749328509 100644
--- a/testsuite/test_gst_init.c
+++ b/testsuite/test_gst_init.c
@@ -1,7 +1,13 @@
 #include <gst/gst.h>
 
+/* This tests that gst_init() doesn't segfault when passed two NULLs as
+ * parameters, and that it doesn't fail if gst_init() happens to get called
+ * a second time. */
 int
 main (int argc, char *argv[])
 {
-  gst_init(&argc,&argv);
+  gst_init(NULL, NULL);
+  gst_init(&argc, &argv);
+
+  return 0;
 }