diff --git a/coregrind/m_ume/script.c b/coregrind/m_ume/script.c
index 741838e62..182a23c65 100644
--- a/coregrind/m_ume/script.c
+++ b/coregrind/m_ume/script.c
@@ -55,7 +55,7 @@ Bool VG_(match_script)(const void *hdr, Int len)
    // Find interpreter name, make sure it's an absolute path (starts with
    // '/') and has at least one more char.  First, skip over any space
    // between the #! and the start of the interpreter name
-   while (interp < end && VG_(isspace)(*interp)) interp++;
+   while (interp < end && (*interp == ' ' || *interp == '\t')) interp++;
 
    // overrun?
    if (interp >= end)   return False;  // can't find start of interp name
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 54790425a..fee4a782f 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -159,6 +159,7 @@ EXTRA_DIST = \
 	shell_valid1 shell_valid1.vgtest shell_valid1.stderr.exp \
 	shell_valid2 shell_valid2.vgtest shell_valid2.stderr.exp \
 	shell_valid3 shell_valid3.vgtest shell_valid3.stderr.exp \
+	shell_valid4 shell_valid4.vgtest shell_valid4.stderr.exp shell_valid4.stdout.exp \
 	shell_zerolength shell_zerolength.vgtest shell_zerolength.stderr.exp \
 	    shell_zerolength.stderr.exp-dash \
 	sha1_test.stderr.exp sha1_test.vgtest \
diff --git a/none/tests/shell_valid4 b/none/tests/shell_valid4
new file mode 100755
index 000000000..fe35d8ae6
--- /dev/null
+++ b/none/tests/shell_valid4
@@ -0,0 +1,3 @@
+#! 
+/bin/echo
+
diff --git a/none/tests/shell_valid4.stderr.exp b/none/tests/shell_valid4.stderr.exp
new file mode 100644
index 000000000..e69de29bb
diff --git a/none/tests/shell_valid4.stdout.exp b/none/tests/shell_valid4.stdout.exp
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/none/tests/shell_valid4.stdout.exp
@@ -0,0 +1 @@
+
diff --git a/none/tests/shell_valid4.vgtest b/none/tests/shell_valid4.vgtest
new file mode 100644
index 000000000..1178aa1cf
--- /dev/null
+++ b/none/tests/shell_valid4.vgtest
@@ -0,0 +1,7 @@
+#
+# This test used to write 
+#   ./shell_valid4
+# to stdout which is not what happens when executed natively.
+#
+prog: shell_valid4
+vgopts: -q