diff --git a/ChangeLog b/ChangeLog
index 9a041eb807..9606f3c2cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-04  Florian Weimer  <fweimer@redhat.com>
+
+	* stdlib/tst-secure-getenv.c (alternative_main): Only warn on SGID
+	failures.
+
 2012-09-04  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #9914]
diff --git a/stdlib/tst-secure-getenv.c b/stdlib/tst-secure-getenv.c
index 276b0aff7b..b52aaf0b19 100644
--- a/stdlib/tst-secure-getenv.c
+++ b/stdlib/tst-secure-getenv.c
@@ -228,9 +228,10 @@ alternative_main (int argc, char **argv)
     {
       if (getgid () == getegid ())
 	{
-	  printf ("SGID failed: GID and EGID match (%jd)\n",
+	  /* This can happen if the file system is mounted nosuid. */
+	  fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n",
 		  (intmax_t) getgid ());
-	  exit (2);
+	  exit (MAGIC_STATUS);
 	}
       if (getenv ("PATH") == NULL)
 	{