diff --git a/tests/data/test31 b/tests/data/test31
index a9aec7722..dbad88a27 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -22,10 +22,10 @@ Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;
 Set-Cookie:eat=this; domain=moo.foo.moo;
 Set-Cookie: eat=this-too; domain=.foo.moo;
 Set-Cookie: nodomainnovalue
-Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 GMT 2014
+Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 GMT 2038
 Set-Cookie: novalue; domain=reallysilly
-Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
-Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 GMT 2038
 
 boo
 </data>
diff --git a/tests/data/test46 b/tests/data/test46
index 563ba0735..f2a642db8 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -14,7 +14,7 @@ HTTP/1.1 200 OK
 Server: Microsoft-IIS/4.0
 Date: Tue, 25 Sep 2001 19:37:44 GMT
 Content-Type: text/html
-Set-Cookie: ckyPersistent=permanent; expires=Tue, 01-Jan-2010 05:00:00 GMT; path=/
+Set-Cookie: ckyPersistent=permanent; expires=Tue, 01-Jan-2038 05:00:00 GMT; path=/
 Set-Cookie: ckySession=temporary; path=/
 Set-Cookie: ASPSESSIONIDQGGQQSJJ=GKNBDIFAAOFDPDAIEAKDIBKE; path=/
 Set-Cookie: justaname=; path=/;
diff --git a/tests/data/test506 b/tests/data/test506
index 8b3aeedf6..f8daad660 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -6,9 +6,9 @@ HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
-Set-Cookie: test1=one; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
-Set-Cookie: test2=two; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
-Set-Cookie: test3=three; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test1=one; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test2=two; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test3=three; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
 Content-Length: 29
 
 run 1: set cookie 1, 2 and 3
@@ -18,8 +18,8 @@ HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:01 GMT
 Server: test-server/fake
 Content-Type: text/html
-Set-Cookie: test4=four; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
-Set-Cookie: test5=five; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test4=four; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test5=five; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
 Content-Length: 26
 
 run 2: set cookie 4 and 5
diff --git a/tests/data/test61 b/tests/data/test61
index 5ccd7724d..2dde9b894 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -16,8 +16,8 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Funny-head: yesyes
-Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
-Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2007
+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
+Set-Cookie: test2=yes; domain=host.foo.com; expires=Tue Feb 1 11:56:27 GMT 2038
 Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
 Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
 Set-Cookie: test5=name; domain=anything.com; path=/ ; secure