diff --git a/ChangeLog b/ChangeLog
index 63c9ce8590..916b851a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-10-05  H.J. Lu  <hongjiu.lu@intel.com>
 
+	[BZ #14602]
+	* string/test-strstr.c (check2): New function.
+	(test_main): Call check2.
+
 	* string/Makefile (tests): Remove bug-strstr1, bug-strcasestr1
 	and bug-strchr1.
 	* string/bug-strcasestr1.c (do_test): Moved to ...
diff --git a/string/test-strstr.c b/string/test-strstr.c
index e7d8e73ba8..1aebd351c3 100644
--- a/string/test-strstr.c
+++ b/string/test-strstr.c
@@ -156,12 +156,24 @@ check1 (void)
     check_result (impl, s1, s2, exp_result);
 }
 
+static void
+check2 (void)
+{
+  const char s1[] = ", enable_static, \0, enable_shared, ";
+  char *exp_result;
+
+  exp_result = stupid_strstr (s1, s1 + 18);
+  FOR_EACH_IMPL (impl, 0)
+    check_result (impl, s1, s1 + 18, exp_result);
+}
+
 static int
 test_main (void)
 {
   test_init ();
 
   check1 ();
+  check2 ();
 
   printf ("%23s", "");
   FOR_EACH_IMPL (impl, 0)