diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 45532505d4..3b288647b3 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-17  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* tst-cond25 (do_test_wait): Don't check for return value from
+	pthread_cancel.
+
 2012-10-16  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	[BZ #14652]
diff --git a/nptl/tst-cond25.c b/nptl/tst-cond25.c
index 4488e74ff4..370cd67d1c 100644
--- a/nptl/tst-cond25.c
+++ b/nptl/tst-cond25.c
@@ -228,11 +228,7 @@ do_test_wait (thr_func f)
 
       for (j = 0; j < NUM; j++)
         {
-          if ((ret = pthread_cancel (w[j])) != 0)
-	    {
-	      printf ("waiter[%d]: cancel failed: %s\n", j, strerror (ret));
-	      goto out;
-	    }
+          pthread_cancel (w[j]);
 
           if ((ret = pthread_join (w[j], &thr_ret)) != 0)
 	    {