diff --git a/corecheck/tests/fdleak_cmsg.stderr.exp b/corecheck/tests/fdleak_cmsg.stderr.exp
index b2295879f..8d7f2fee8 100644
--- a/corecheck/tests/fdleak_cmsg.stderr.exp
+++ b/corecheck/tests/fdleak_cmsg.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 8 open at exit.
+FILE DESCRIPTORS: 7 open at exit.
 Open AF_UNIX socket .: /tmp/sock
    at 0x........: __libc_accept (...libc...)
    by 0x........: main (fdleak_cmsg.c:170)
@@ -26,13 +26,10 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 
-FILE DESCRIPTORS: 7 open at exit.
+FILE DESCRIPTORS: 6 open at exit.
 Open file descriptor .: /tmp/data2
    at 0x........: __libc_recvmsg (...libc...)
    by 0x........: main (fdleak_cmsg.c:174)
@@ -54,8 +51,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_creat.stderr.exp b/corecheck/tests/fdleak_creat.stderr.exp
index adb93bd57..2b2d0fdb9 100644
--- a/corecheck/tests/fdleak_creat.stderr.exp
+++ b/corecheck/tests/fdleak_creat.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 5 open at exit.
+FILE DESCRIPTORS: 4 open at exit.
 Open file descriptor .: /tmp/file
 
    at 0x........: __libc_creat (...libc...)
@@ -16,8 +16,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_dup.stderr.exp b/corecheck/tests/fdleak_dup.stderr.exp
index 3ba15a850..554e023ef 100644
--- a/corecheck/tests/fdleak_dup.stderr.exp
+++ b/corecheck/tests/fdleak_dup.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
 Open file descriptor .: /dev/null
    at 0x........: __dup (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
@@ -20,8 +20,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_dup2.stderr.exp b/corecheck/tests/fdleak_dup2.stderr.exp
index cd001c771..6c811ce38 100644
--- a/corecheck/tests/fdleak_dup2.stderr.exp
+++ b/corecheck/tests/fdleak_dup2.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 7 open at exit.
+FILE DESCRIPTORS: 6 open at exit.
 Open file descriptor .: /dev/null
    at 0x........: __dup2 (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
@@ -25,8 +25,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_fcntl.stderr.exp b/corecheck/tests/fdleak_fcntl.stderr.exp
index 270d35b39..3e2a22531 100644
--- a/corecheck/tests/fdleak_fcntl.stderr.exp
+++ b/corecheck/tests/fdleak_fcntl.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
 Open file descriptor .: /dev/null
    at 0x........: __libc_fcntl (...libc...)
    by 0x........: main (fdleak_fcntl.c:18)
@@ -19,8 +19,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_ipv4.stderr.exp b/corecheck/tests/fdleak_ipv4.stderr.exp
index d8cb9970d..b3e88b111 100644
--- a/corecheck/tests/fdleak_ipv4.stderr.exp
+++ b/corecheck/tests/fdleak_ipv4.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
 Open AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:...
    at 0x........: __libc_accept (...libc...)
    by 0x........: main (fdleak_ipv4.c:100)
@@ -18,13 +18,10 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 
-FILE DESCRIPTORS: 5 open at exit.
+FILE DESCRIPTORS: 4 open at exit.
 Open AF_INET socket 3: 127.0.0.1:... <-> 127.0.0.1:...
    at 0x........: __socket (in /...libc...)
    by 0x........: main (fdleak_ipv4.c:104)
@@ -38,8 +35,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_open.stderr.exp b/corecheck/tests/fdleak_open.stderr.exp
index 782e99e4d..85d67ae26 100644
--- a/corecheck/tests/fdleak_open.stderr.exp
+++ b/corecheck/tests/fdleak_open.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 5 open at exit.
+FILE DESCRIPTORS: 4 open at exit.
 Open file descriptor .: /dev/null
    at 0x........: __libc_open (...libc...)
    by 0x........: __libc_start_main (...libc...)
@@ -15,8 +15,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_pipe.stderr.exp b/corecheck/tests/fdleak_pipe.stderr.exp
index f31301c62..41f9d8fd5 100644
--- a/corecheck/tests/fdleak_pipe.stderr.exp
+++ b/corecheck/tests/fdleak_pipe.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
 Open file descriptor .:
    at 0x........: __pipe (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
@@ -20,8 +20,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/corecheck/tests/fdleak_socketpair.stderr.exp b/corecheck/tests/fdleak_socketpair.stderr.exp
index 4d86c117e..a63e4d644 100644
--- a/corecheck/tests/fdleak_socketpair.stderr.exp
+++ b/corecheck/tests/fdleak_socketpair.stderr.exp
@@ -1,6 +1,6 @@
 
 
-FILE DESCRIPTORS: 6 open at exit.
+FILE DESCRIPTORS: 5 open at exit.
 Open AF_UNIX socket .: <unknown>
    at 0x........: __socketpair (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
@@ -20,8 +20,5 @@ Open file descriptor .: .
 Open file descriptor .: .
    <inherited from parent>
 
-Open file descriptor .: .
-   <inherited from parent>
-
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index 29dffb413..44a8f0cda 100644
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -332,6 +332,9 @@ void record_fd_open(Int tid, Int fd, char *pathname)
 {
    OpenFd *i;
 
+   if (fd > VG_MAX_FD)
+      return;			/* Valgrind internal */
+
    /* Check to see if this fd is already open. */
    i = allocated_fds;
    while (i) {