diff --git a/ChangeLog b/ChangeLog
index 487ff2b7e7..5d70cbba44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,11 +12,13 @@
 
 2004-08-11  Jakub Jelinek  <jakub@redhat.com>
 
+	* rt/tst-timer2.c (do_test): If timer_create fails, just continue.
+	* rt/tst-timer4.c (do_test): If one of the timer_create calls fails,
+	return 1 immediately.
+
 	* time/tzfile.c (__tzfile_read): Free transitions only if it will
 	not be reused.
 
-2004-08-11  Jakub Jelinek  <jakub@redhat.com>
-
 	* sysdeps/ieee754/dbl-64/mpa.c: Include <sys/param.h>.
 	* sysdeps/ieee754/dbl-64/mpa.h (MAX, MIN): Macros removed.
 
diff --git a/rt/tst-timer2.c b/rt/tst-timer2.c
index 74ccc492b0..60026c1efd 100644
--- a/rt/tst-timer2.c
+++ b/rt/tst-timer2.c
@@ -40,7 +40,10 @@ do_test (void)
       printf ("cnt = %d\n", i);
 
       if (timer_create (CLOCK_REALTIME, &sigev, &timerId) < 0)
-	perror ("timer_create");
+	{
+	  perror ("timer_create");
+	  continue;
+	}
 
       res = timer_settime (timerId, 0, &itval, NULL);
       if (res < 0)
diff --git a/rt/tst-timer4.c b/rt/tst-timer4.c
index 2175211cb6..bc5d14e5b7 100644
--- a/rt/tst-timer4.c
+++ b/rt/tst-timer4.c
@@ -206,7 +206,7 @@ do_test (void)
   if (timer_create (CLOCK_REALTIME, &ev, &timer_none) != 0)
     {
       printf ("*** timer_create for timer_none failed: %m\n");
-      result = 1;
+      return 1;
     }
 
   struct sigaction sa = { .sa_sigaction = sig1_handler,
@@ -223,7 +223,7 @@ do_test (void)
   if (timer_create (CLOCK_REALTIME, &ev, &timer_sig1) != 0)
     {
       printf ("*** timer_create for timer_sig1 failed: %m\n");
-      result = 1;
+      return 1;
     }
 
   memset (&ev, 0x33, sizeof (ev));
@@ -233,7 +233,7 @@ do_test (void)
   if (timer_create (CLOCK_REALTIME, &ev, &timer_sig2) != 0)
     {
       printf ("*** timer_create for timer_sig2 failed: %m\n");
-      result = 1;
+      return 1;
     }
 
   memset (&ev, 0x44, sizeof (ev));
@@ -244,7 +244,7 @@ do_test (void)
   if (timer_create (CLOCK_REALTIME, &ev, &timer_thr1) != 0)
     {
       printf ("*** timer_create for timer_thr1 failed: %m\n");
-      result = 1;
+      return 1;
     }
 
   pthread_attr_t nattr;
@@ -263,7 +263,7 @@ do_test (void)
   if (timer_create (CLOCK_REALTIME, &ev, &timer_thr2) != 0)
     {
       printf ("*** timer_create for timer_thr2 failed: %m\n");
-      result = 1;
+      return 1;
     }
 
   int ret = timer_getoverrun (timer_thr1);