diff --git a/ChangeLog b/ChangeLog
index 05b552d4b4..f820d86c2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-18  David Schleef  <ds@schleef.org>
+
+	* testsuite/debug/commandline.c: (main): Call ./commandline, not
+	  argv[0].  Calling yourself is probably not the best way to
+	  construct a test like this, btw.
+
 2004-05-18  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/gstbin.c: (gst_bin_iterate_func), (gst_bin_iterate):
diff --git a/tests/old/testsuite/debug/commandline.c b/tests/old/testsuite/debug/commandline.c
index 9416740bb8..fbfafe7949 100644
--- a/tests/old/testsuite/debug/commandline.c
+++ b/tests/old/testsuite/debug/commandline.c
@@ -59,10 +59,12 @@ main (gint argc, gchar * argv[])
 
       runs = G_N_ELEMENTS (lines);
       for (i = 0; i < runs; i++) {
-        command = g_strdup_printf ("%s %s %d", argv[0], lines[i], i);
+        int ret;
+
+        command = g_strdup_printf ("./commandline %s %d", lines[i], i);
         g_print ("running \"%s\"\n", command);
-        g_assert (g_spawn_command_line_sync (command, NULL, NULL, &exit,
-                NULL) == TRUE);
+        ret = g_spawn_command_line_sync (command, NULL, NULL, &exit, NULL);
+        g_assert (ret == TRUE);
         g_assert (exit == 0);
         g_print ("\"%s\" worked as expected.\n", command);
         g_free (command);
diff --git a/testsuite/debug/commandline.c b/testsuite/debug/commandline.c
index 9416740bb8..fbfafe7949 100644
--- a/testsuite/debug/commandline.c
+++ b/testsuite/debug/commandline.c
@@ -59,10 +59,12 @@ main (gint argc, gchar * argv[])
 
       runs = G_N_ELEMENTS (lines);
       for (i = 0; i < runs; i++) {
-        command = g_strdup_printf ("%s %s %d", argv[0], lines[i], i);
+        int ret;
+
+        command = g_strdup_printf ("./commandline %s %d", lines[i], i);
         g_print ("running \"%s\"\n", command);
-        g_assert (g_spawn_command_line_sync (command, NULL, NULL, &exit,
-                NULL) == TRUE);
+        ret = g_spawn_command_line_sync (command, NULL, NULL, &exit, NULL);
+        g_assert (ret == TRUE);
         g_assert (exit == 0);
         g_print ("\"%s\" worked as expected.\n", command);
         g_free (command);