diff --git a/ChangeLog b/ChangeLog
index cc08ba8e9a..9552fc5bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* include/stdio.h (__open_memstream): Say "C++ tests" in comment.
+
 2015-06-06  Justus Winter  <4winter@informatik.uni-hamburg.de>
 
 	* mach/mach/mach_traps.h (thread_switch): Fix typo in comment.
diff --git a/include/stdio.h b/include/stdio.h
index 78bd3c471b..489e41999d 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -161,7 +161,7 @@ libc_hidden_proto (__fgets_unlocked)
 libc_hidden_proto (fputs_unlocked)
 libc_hidden_proto (fmemopen)
 /* The prototype needs repeating instead of using __typeof to use
-   __THROW in C++.  */
+   __THROW in C++ tests.  */
 extern FILE *__open_memstream (char **, size_t *) __THROW __wur;
 libc_hidden_proto (__open_memstream)
 libc_hidden_proto (__libc_fatal)