diff --git a/ChangeLog b/ChangeLog
index 8ca782c5a..df400cf3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	Added typedef for GSIVar.
 	(GSCGetInstanceVariableDefinition): New function.
 	(GSObjCGetInstanceVariableDefinition): Ditto.
+	* Testing/nstimer.m ([TestDouble -sayCount]): Quit test after 20
+	invocations.
 
 2003-07-07  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Testing/nstimer.m b/Testing/nstimer.m
index f4e151626..f4c07b47e 100644
--- a/Testing/nstimer.m
+++ b/Testing/nstimer.m
@@ -12,6 +12,8 @@
 {
   static int count = 0;
   printf ("Timer fired %d times\n", ++count);
+  if (count == 20)
+    exit(0);
 }
 + (double) testDouble
 {