--- /dev/null	Thu Dec  6 21:08:28 2012
+++ new/test/java/net/HttpCookie/ExpiredCookieTest.java	Thu Dec  6 21:08:27 2012
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* 
+ * @test
+ * @bug 8000525
+ */
+
+import java.net.*;
+import java.util.*;
+import java.io.*;
+import java.text.*;
+
+public class ExpiredCookieTest {
+    // lifted from HttpCookie.java
+    private final static String[] COOKIE_DATE_FORMATS = {
+        "EEE',' dd-MMM-yy HH:mm:ss 'GMT'",
+        "EEE',' dd MMM yy HH:mm:ss 'GMT'",
+        "EEE MMM dd yy HH:mm:ss 'GMT'Z",
+        "EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'",
+        "EEE',' dd MMM yyyy HH:mm:ss 'GMT'",
+        "EEE MMM dd yyyy HH:mm:ss 'GMT'Z"
+    };
+    static final TimeZone GMT = TimeZone.getTimeZone("GMT");
+
+    public static void main(String[] args) throws IOException {
+        Calendar cal = Calendar.getInstance(GMT);
+
+        try {
+            for (int i = 0; i < COOKIE_DATE_FORMATS.length; i++) {
+                SimpleDateFormat df = new SimpleDateFormat(COOKIE_DATE_FORMATS[i],
+                                                         Locale.US);
+                cal.set(1970, 0, 1, 0, 0, 0);
+                df.setTimeZone(GMT);
+                df.setLenient(false);
+                df.set2DigitYearStart(cal.getTime());
+                CookieManager cm = new CookieManager(
+                    null, CookiePolicy.ACCEPT_ALL);
+                CookieHandler.setDefault(cm);
+                Map<String,List<String>> header = new HashMap<>();
+                List<String> values = new ArrayList<>();
+
+                cal.set(1970, 6, 9, 10, 10, 1);
+                StringBuilder datestring = 
+                    new StringBuilder(df.format(cal.getTime()));
+                values.add(
+                    "TEST1=TEST1; Path=/; Expires=" + datestring.toString());
+                
+                cal.set(1969, 6, 9, 10, 10, 2);
+                datestring = new StringBuilder(df.format(cal.getTime()));
+                values.add(
+                    "TEST2=TEST2; Path=/; Expires=" + datestring.toString());
+
+                cal.set(2070, 6, 9, 10, 10, 3);
+                datestring = new StringBuilder(df.format(cal.getTime()));
+                values.add(
+                    "TEST3=TEST3; Path=/; Expires=" + datestring.toString());
+
+                cal.set(2069, 6, 9, 10, 10, 4);
+                datestring = new StringBuilder(df.format(cal.getTime()));
+                values.add(
+                    "TEST4=TEST4; Path=/; Expires=" + datestring.toString());
+                
+                header.put("Set-Cookie", values);
+                cm.put(new URI("http://127.0.0.1/"), header);
+
+                CookieStore cookieJar =  cm.getCookieStore();
+                List <HttpCookie> cookies = cookieJar.getCookies();
+                if (COOKIE_DATE_FORMATS[i].contains("yyyy")) {
+                    if (cookies.size() != 2)
+                        throw new RuntimeException(
+                            "Incorrectly parsing a bad date");
+                } else if (cookies.size() != 1) {
+                    throw new RuntimeException(
+                        "Incorrectly parsing a bad date");
+                }
+            }
+        } catch(Exception e) {
+            System.out.println("Unable to get cookie using CookieHandler");
+            e.printStackTrace();
+        }
+    }
+}