diff --git a/ChangeLog b/ChangeLog
index d154e40..2f1dbd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Wed Jul 27 00:51:58 PDT 2005  Christian Hammond <chipx86@chipx86.com>
+
+	* tests/test-animation.c:
+	* tests/test-basic.c:
+	* tests/test-error.c:
+	* tests/test-image.c:
+	* tests/test-markup.c:
+	* tests/test-xy.c:
+	* tests/test-xy-stress.c:
+	  - Actually support our own spec and use the number of seconds until
+	    expiration instead of current time + number of seconds. That was
+	    creating all kinds of problems.
+
 Wed Jul 27 00:31:47 PDT 2005  Christian Hammond <chipx86@chipx86.com>
 
 	* libnotify/dbus-compat.h:
diff --git a/tests/test-animation.c b/tests/test-animation.c
index 4f99480..7fc48f4 100644
--- a/tests/test-animation.c
+++ b/tests/test-animation.c
@@ -92,7 +92,7 @@ int main()
 											   NOTIFY_URGENCY_NORMAL,
 											   "Summary", "Content",
 											   icon,
-											   TRUE, time(NULL) + 5,
+											   TRUE, 0,
 											   NULL, // no hints
 											   NULL, // no user data
 											   0); // no actions
diff --git a/tests/test-basic.c b/tests/test-basic.c
index 6c712b3..21dad80 100644
--- a/tests/test-basic.c
+++ b/tests/test-basic.c
@@ -31,7 +31,7 @@ int main() {
 											   NOTIFY_URGENCY_NORMAL,
 											   "Summary", "Content",
 											   NULL, // no icon
-											   TRUE, time(NULL) + 5,
+											   TRUE, 0,
 											   NULL, // no hints
 											   NULL, // no user data
 											   0); // no actions
diff --git a/tests/test-error.c b/tests/test-error.c
index 385eec5..fd34b37 100644
--- a/tests/test-error.c
+++ b/tests/test-error.c
@@ -33,7 +33,7 @@ int main() {
 											   NOTIFY_URGENCY_NORMAL,
 											   "Summary", "Content",
 											   icon, // no icon
-											   TRUE, time(NULL) + 5,
+											   TRUE, 0,
 											   NULL, // no hints
 											   NULL, // no user data
 											   0);
diff --git a/tests/test-image.c b/tests/test-image.c
index 7329319..566ef61 100644
--- a/tests/test-image.c
+++ b/tests/test-image.c
@@ -55,7 +55,7 @@ static void send(char *i, size_t rawlen, char *s, char *b)
 								 NOTIFY_URGENCY_NORMAL,
 								 s, b,
 								 icon,
-								 TRUE, time(NULL) + 5,
+								 TRUE, 0,
 								 NULL, // no hints
 								 NULL, // no user data
 								 0);
diff --git a/tests/test-markup.c b/tests/test-markup.c
index 6455f02..bd9aee6 100644
--- a/tests/test-markup.c
+++ b/tests/test-markup.c
@@ -34,7 +34,7 @@ int main() {
 		"Some <b>bold</b>, <u>underlined</u>, <i>italic</i>, "
 		"<a href='http://www.google.com'>linked</a> text",
 		NULL, // no icon
-		FALSE, 0,
+		TRUE, 0,
 		NULL, // no hints
 		NULL, // no user data
 		0); // no actions
diff --git a/tests/test-xy-stress.c b/tests/test-xy-stress.c
index c825630..718c315 100644
--- a/tests/test-xy-stress.c
+++ b/tests/test-xy-stress.c
@@ -44,7 +44,7 @@ emit_notification(int x, int y)
 		"X, Y Test",
 		buffer,
 		NULL, // no icon
-		TRUE, time(NULL) + 5,
+		TRUE, 0,
 		hints,
 		NULL, // no user data
 		0); // no actions
diff --git a/tests/test-xy.c b/tests/test-xy.c
index 2c6ee96..30e670b 100644
--- a/tests/test-xy.c
+++ b/tests/test-xy.c
@@ -39,7 +39,7 @@ int main() {
 		"X, Y Test",
 		"This notification should point to 150, 10.",
 		NULL, // no icon
-		TRUE, time(NULL) + 5,
+		TRUE, 0,
 		hints,
 		NULL, // no user data
 		0); // no actions