diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php
index 707106373b585893b9bd03212a9c15ec40ff9ec8..76938a0dcc8bcb44601d60974c6e035a2b433915 100644
--- a/tests/lib/files/node/file.php
+++ b/tests/lib/files/node/file.php
@@ -8,8 +8,8 @@
 
 namespace Test\Files\Node;
 
-use OC\Files\NotFoundException;
-use OC\Files\NotPermittedException;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OC\Files\View;
 
 class File extends \PHPUnit_Framework_TestCase {
@@ -106,7 +106,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testDeleteNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
@@ -162,7 +162,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testGetContentNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
@@ -212,7 +212,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testPutContentNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
@@ -327,7 +327,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testFOpenReadNotPermitted() {
 		/**
@@ -354,7 +354,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testFOpenReadWriteNoReadPermissions() {
 		/**
@@ -381,7 +381,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testFOpenReadWriteNoWritePermissions() {
 		/**
@@ -443,7 +443,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testCopyNotPermitted() {
 		/**
@@ -483,7 +483,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotFoundException
+	 * @expectedException \OCP\Files\NotFoundException
 	 */
 	public function testCopyNoParent() {
 		/**
@@ -510,7 +510,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testCopyParentIsFile() {
 		/**
@@ -571,7 +571,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testMoveNotPermitted() {
 		/**
@@ -603,7 +603,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotFoundException
+	 * @expectedException \OCP\Files\NotFoundException
 	 */
 	public function testMoveNoParent() {
 		/**
@@ -635,7 +635,7 @@ class File extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testMoveParentIsFile() {
 		/**
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 691aa612c7f55405afdaa0bf06b10fdc829026ed..b1589a276ba4cacca3dfcecc707e5287b3c103fa 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -10,8 +10,8 @@ namespace Test\Files\Node;
 
 use OC\Files\Cache\Cache;
 use OC\Files\Node\Node;
-use OC\Files\NotFoundException;
-use OC\Files\NotPermittedException;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OC\Files\View;
 
 class Folder extends \PHPUnit_Framework_TestCase {
@@ -103,7 +103,7 @@ class Folder extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testDeleteNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
@@ -275,7 +275,7 @@ class Folder extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testNewFolderNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
@@ -325,7 +325,7 @@ class Folder extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testNewFileNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index c99b6f99ebcda671e5f1a77c1f36c5c995c04e83..bc439c1aa0b940370bc4c657ae56d652b2b69f99 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -11,8 +11,8 @@ namespace Test\Files\Node;
 use OC\Files\Cache\Cache;
 use OC\Files\Mount\Manager;
 use OC\Files\Node\Root;
-use OC\Files\NotFoundException;
-use OC\Files\NotPermittedException;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 use OC\User\User;
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
index aa9d2a382eb26dbe16b7913476a54e2dd683d415..cf5fec30522124ec39d6745d8f01e5555d757348 100644
--- a/tests/lib/files/node/node.php
+++ b/tests/lib/files/node/node.php
@@ -306,7 +306,7 @@ class Node extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testTouchNotPermitted() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php
index 0b356ec6d9732b0fb4d5495ad914c0cb8cb470d8..97eaf7f716267fc812fa7267d5a0844938ea2047 100644
--- a/tests/lib/files/node/root.php
+++ b/tests/lib/files/node/root.php
@@ -9,7 +9,7 @@
 namespace Test\Files\Node;
 
 use OC\Files\Cache\Cache;
-use OC\Files\NotPermittedException;
+use OCP\Files\NotPermittedException;
 use OC\Files\Mount\Manager;
 
 class Root extends \PHPUnit_Framework_TestCase {
@@ -53,7 +53,7 @@ class Root extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotFoundException
+	 * @expectedException \OCP\Files\NotFoundException
 	 */
 	public function testGetNotFound() {
 		$manager = new Manager();
@@ -77,7 +77,7 @@ class Root extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotPermittedException
+	 * @expectedException \OCP\Files\NotPermittedException
 	 */
 	public function testGetInvalidPath() {
 		$manager = new Manager();
@@ -91,7 +91,7 @@ class Root extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @expectedException \OC\Files\NotFoundException
+	 * @expectedException \OCP\Files\NotFoundException
 	 */
 	public function testGetNoStorages() {
 		$manager = new Manager();