diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 3cfca2202..26ae31cd6 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -300,7 +300,8 @@ EXTRA_DIST += \
 	keyfiletest.ini		\
 	pages.ini		\
 	bookmarks.xbel		\
-	empty
+	empty			\
+	echo-script
 
 dist-hook:
 	mkdir $(distdir)/markups;		\
diff --git a/glib/tests/spawn-singlethread.c b/glib/tests/spawn-singlethread.c
index e63e789ae..9f71d596d 100644
--- a/glib/tests/spawn-singlethread.c
+++ b/glib/tests/spawn-singlethread.c
@@ -194,12 +194,15 @@ main (int   argc,
 
   dirname = g_path_get_dirname (argv[0]);
   echo_prog_path = g_build_filename (dirname, "test-spawn-echo", NULL);
-  echo_script_path = g_build_filename (dirname, "echo-script", NULL);
   if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS))
     {
       g_free (echo_prog_path);
       echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo", NULL);
     }
+#ifndef SRCDIR
+#define SRCDIR dirname
+#endif
+  echo_script_path = g_build_filename (SRCDIR, "echo-script", NULL);
   if (!g_file_test (echo_script_path, G_FILE_TEST_EXISTS))
     {
       gchar *tmp;