diff --git a/apps/dav/tests/unit/bootstrap.php b/apps/dav/tests/unit/bootstrap.php
new file mode 100644
index 000000000000..52bf2c6a65c0
--- /dev/null
+++ b/apps/dav/tests/unit/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+
+define('PHPUNIT_RUN', 1);
+
+require_once __DIR__.'/../../../../lib/base.php';
+
+if(!class_exists('PHPUnit_Framework_TestCase')) {
+	require_once('PHPUnit/Autoload.php');
+}
+
+OC_Hook::clear();
diff --git a/apps/dav/tests/unit/phpunit.xml b/apps/dav/tests/unit/phpunit.xml
new file mode 100644
index 000000000000..46c3cdfb345f
--- /dev/null
+++ b/apps/dav/tests/unit/phpunit.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="bootstrap.php"
+		 verbose="true"
+		 timeoutForSmallTests="900"
+		 timeoutForMediumTests="900"
+		 timeoutForLargeTests="900"
+		>
+	<testsuite name='unit'>
+		<directory suffix='test.php'>.</directory>
+	</testsuite>
+	<!-- filters for code coverage -->
+	<filter>
+		<whitelist>
+			<directory suffix=".php">../../dav</directory>
+			<exclude>
+				<directory suffix=".php">../../dav/tests</directory>
+			</exclude>
+		</whitelist>
+	</filter>
+	<logging>
+		<!-- and this is where your report will be written -->
+		<log type="coverage-clover" target="./clover.xml"/>
+	</logging>
+</phpunit>
+
diff --git a/apps/dav/tests/unit/upload/futurefiletest.php b/apps/dav/tests/unit/upload/futurefiletest.php
new file mode 100644
index 000000000000..b3e4d335d2f7
--- /dev/null
+++ b/apps/dav/tests/unit/upload/futurefiletest.php
@@ -0,0 +1,36 @@
+<?php
+
+class FutureFileTest extends \PHPUnit_Framework_TestCase {
+
+	public function testGetContentType() {
+		$f = $this->mockFutureFile();
+		$this->assertEquals('application/octet-stream', $f->getContentType());
+	}
+
+	public function testGetETag() {
+		$f = $this->mockFutureFile();
+		$this->assertEquals('1234567890', $f->getETag());
+	}
+
+	public function testGetName() {
+		$f = $this->mockFutureFile();
+		$this->assertEquals('foo.txt', $f->getName());
+	}
+
+	/**
+	 * @return \OCA\DAV\Upload\FutureFile
+	 */
+	private function mockFutureFile() {
+		$d = $this->getMockBuilder('OCA\DAV\Connector\Sabre\Directory')
+			->disableOriginalConstructor()
+			->setMethods(['getETag'])
+			->getMock();
+
+		$d->expects($this->any())
+			->method('getETag')
+			->willReturn('1234567890');
+
+		return new \OCA\DAV\Upload\FutureFile($d, 'foo.txt');
+	}
+}
+