diff --git a/ChangeLog b/ChangeLog
index 665f5ccabd..34b31281ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-07-16  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* tst-nodelete-opened.c (do_test): Add comment to clarify how
+	the test can fail.
+
 	* stdlib/cxa_thread_atexit_impl.c: Whitespace fixup.
 
 	[BZ #18676]
diff --git a/elf/tst-nodelete-opened.c b/elf/tst-nodelete-opened.c
index 43b00fa16d..501d005f81 100644
--- a/elf/tst-nodelete-opened.c
+++ b/elf/tst-nodelete-opened.c
@@ -58,6 +58,8 @@ do_test (void)
       return 1;
     }
 
+  /* This FOO dereference will crash with a segfault if the DSO was
+     unloaded.  */
   printf ("foo == %d\n", *foo);
 
   return 0;