diff --git a/docs/server_support.rst b/docs/server_support.rst
index c0903be..ca9cfaa 100644
--- a/docs/server_support.rst
+++ b/docs/server_support.rst
@@ -42,10 +42,8 @@ ownCloud
 
 Vdirsyncer is tested against the latest version of ownCloud.
 
-ownCloud uses SabreDAV, which had problems detecting collisions and
-race-conditions. The problems were reported and are fixed in SabreDAV's repo.
-See `Bug #16 <https://github.com/untitaker/vdirsyncer/issues/16>`_ for more
-information.
-
-However, given that this is a problem with every setup involving ownCloud, and
-that ownCloud is widely used, it apparently isn't big enough of a problem yet.
+- *Versions older than 7.0.0:* ownCloud uses SabreDAV, which had problems
+  detecting collisions and race-conditions. The problems were reported and are
+  fixed in SabreDAV's repo, and the corresponding fix is also in ownCloud since
+  7.0.0. See `Bug #16 <https://github.com/untitaker/vdirsyncer/issues/16>`_ for
+  more information.
diff --git a/tests/storage/dav/test_main.py b/tests/storage/dav/test_main.py
index 537c5ef..f9e67e5 100644
--- a/tests/storage/dav/test_main.py
+++ b/tests/storage/dav/test_main.py
@@ -52,11 +52,9 @@ class DavStorageTests(ServerMixin, StorageTests):
             pass
         assert not list(s.list())
 
-    @pytest.mark.xfail(dav_server == 'owncloud', reason='See issue #16')
     def test_wrong_etag(self, s):
         super(DavStorageTests, self).test_wrong_etag(s)
 
-    @pytest.mark.xfail(dav_server == 'owncloud', reason='See issue #16')
     def test_update_nonexisting(self, s):
         super(DavStorageTests, self).test_update_nonexisting(s)