diff --git a/Lib/test/output/test_cookie b/Lib/test/output/test_cookie
index 735b847ca78..30b57fe6e7e 100644
--- a/Lib/test/output/test_cookie
+++ b/Lib/test/output/test_cookie
@@ -1,10 +1,15 @@
 test_cookie
+<SimpleCookie: vienna='finger' chips='ahoy'>
 Set-Cookie: vienna=finger;
 Set-Cookie: chips=ahoy;
   vienna 'finger' 'finger'
+Set-Cookie: vienna=finger;
   chips 'ahoy' 'ahoy'
+Set-Cookie: chips=ahoy;
+<SimpleCookie: keebler='E=mc2; L="Loves"; fudge=\012;'>
 Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;";
   keebler 'E=mc2; L="Loves"; fudge=\012;' 'E=mc2; L="Loves"; fudge=\012;'
+Set-Cookie: keebler="E=mc2; L=\"Loves\"; fudge=\012;";
 Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme;
 
         <SCRIPT LANGUAGE="JavaScript">
diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
index 9ae009d73a5..a275cf239c4 100644
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -13,10 +13,12 @@
 
 for data, dict in cases:
     C = Cookie.SimpleCookie() ; C.load(data)
-    print C
+    print repr(C)
+    print str(C)
     for k, v in dict.items():
         print ' ', k, repr( C[k].value ), repr(v)
         assert C[k].value == v
+        print C[k]
 
 C = Cookie.SimpleCookie()
 C.load('Customer="WILE_E_COYOTE"; Version=1; Path=/acme')
@@ -29,3 +31,10 @@
 print C.js_output()
 print C.js_output(['path'])
 
+# Try cookie with quoted meta-data
+C = Cookie.SimpleCookie()
+C.load('Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"')
+assert C['Customer'].value == 'WILE_E_COYOTE'
+assert C['Customer']['version'] == '1'
+assert C['Customer']['path'] == '/acme'
+