diff --git a/tests/cli/test_repair.py b/tests/cli/test_repair.py
index 0b7e320..c67a1ff 100644
--- a/tests/cli/test_repair.py
+++ b/tests/cli/test_repair.py
@@ -9,12 +9,10 @@ from vdirsyncer.utils.vobject import Item
 
 def test_repair_uids():
     s = MemoryStorage()
-    s.upload(Item(u'BEGIN:VCARD\nEND:VCARD'))
-
-    repair_storage(s)
-
-    uid, = [s.get(href)[0].uid for href, etag in s.list()]
-    s.upload(Item(u'BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid)))
+    s.items = {
+        'one': ('asdf', Item(u'BEGIN:VCARD\nFN:Hans\nUID:asdf\nEND:VCARD')),
+        'two': ('asdf', Item(u'BEGIN:VCARD\nFN:Peppi\nUID:asdf\nEND:VCARD'))
+    }
 
     uid1, uid2 = [s.get(href)[0].uid for href, etag in s.list()]
     assert uid1 == uid2
@@ -30,7 +28,8 @@ def test_repair_nonascii_uids():
     href, etag = s.upload(Item(u'BEGIN:VCARD\nUID:äää\nEND:VCARD'))
     assert s.get(href)[0].uid == u'äää'
     repair_storage(s)
-    newuid = s.get(href)[0].uid
+    new_href = list(s.list())[0][0]
+    newuid = s.get(new_href)[0].uid
     assert newuid != u'äää'
     assert newuid.encode('ascii', 'ignore').decode('ascii') == newuid
 
@@ -56,4 +55,5 @@ def test_full(tmpdir, runner):
     assert 'No UID' in result.output
     assert 'warning: Item toobroken.txt can\'t be parsed, skipping' \
         in result.output
-    assert 'UID:' in foo.join('item.txt').read()
+    new_fname, = [x for x in foo.listdir() if 'toobroken' not in str(x)]
+    assert 'UID:' in new_fname.read()
diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py
index 4ded5f7..919b507 100644
--- a/vdirsyncer/cli/utils.py
+++ b/vdirsyncer/cli/utils.py
@@ -688,7 +688,11 @@ def repair_storage(storage):
         seen_uids.add(new_item.uid)
         if changed:
             try:
-                storage.update(href, new_item, etag)
+                if new_item.uid != item.uid:
+                    storage.upload(new_item)
+                    storage.delete(href, etag)
+                else:
+                    storage.update(href, new_item, etag)
             except Exception:
                 cli_logger.exception('Server rejected new item.')