diff --git a/tests/__init__.py b/tests/__init__.py
index 8effcb0..1b5706b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,9 +1,12 @@
 def normalize_item(item):
+    # - X-RADICALE-NAME is used by radicale, because hrefs don't really exist
+    #   in their filesystem backend
+    # - PRODID is changed by radicale for some reason after upload, but nobody
+    #   cares about that anyway
     rv = set()
     for line in item.raw.splitlines():
         line = line.strip()
         line = line.strip().split(u':', 1)
-        line[0] = line[0].split(';')[0]
         if line[0] in ('X-RADICALE-NAME', 'PRODID', 'REV'):
             continue
         rv.add(u':'.join(line))
diff --git a/tests/storage/dav/test_carddav.py b/tests/storage/dav/test_carddav.py
index e70c017..99c1771 100644
--- a/tests/storage/dav/test_carddav.py
+++ b/tests/storage/dav/test_carddav.py
@@ -21,11 +21,11 @@ class TestCarddavStorage(DavStorageTests):
                      u'N:Daboo;Cyrus\n'
                      u'ADR;TYPE=POSTAL:;2822 Email HQ;'  # address continuing
                      u'Suite 2821;RFCVille;PA;15213;USA\n'  # on next line
-                     u'EMAIL;TYPE=INTERNET,PREF:cyrus@example.com\n'
+                     u'EMAIL;TYPE=INTERNET;TYPE=PREF:cyrus@example.com\n'
                      u'NICKNAME:me\n'
                      u'NOTE:Example VCard.\n'
                      u'ORG:Self Employed\n'
-                     u'TEL;TYPE=WORK,VOICE:412 605 0499\n'
+                     u'TEL;TYPE=WORK;TYPE=VOICE:412 605 0499\n'
                      u'TEL;TYPE=FAX:412 605 0705\n'
                      u'URL:http://www.example.com\n'
                      u'UID:{uid}\n'