diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1233a9d44a..4d291ea109 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* tst-cancel4.c (do_test): Also unlink tempfname and remove
+	tempmsg in first loop.
+
 2003-08-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/posix_opt.h: Define
diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 19e1baf9a9..d6d9f69f5f 100644
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -2119,8 +2119,17 @@ do_test (void)
 	  close (tempfd2);
 	  tempfd2 = -1;
 	}
-      free (tempfname);
-      tempfname = NULL;
+      if (tempfname != NULL)
+	{
+	  unlink (tempfname);
+	  free (tempfname);
+	  tempfname = NULL;
+	}
+      if (tempmsg != -1)
+	{
+	  msgctl (tempmsg, IPC_RMID, NULL);
+	  tempmsg = -1;
+	}
     }
 
   for (cnt = 0; cnt < ntest_tf; ++cnt)