diff --git a/lib/private/util.php b/lib/private/util.php
index 6c0a8d7bab..43f2c9bb63 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -806,7 +806,9 @@ class OC_Util {
 			'baseUri' => OC_Helper::linkToRemote('webdav'),
 		);
 
-		$client = new \Sabre_DAV_Client($settings);
+		$client = new \OC_DAVClient($settings);
+
+		$client->setRequestTimeout(10);
 
 		// for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
 		$client->setVerifyPeer(false);