diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php
index e4b78485114a0729e795c387807dfbac8aff2a87..9ab0631e93ac93645fcfffd570c5b15071849ce7 100644
--- a/apps/dav/tests/unit/CardDAV/ConverterTest.php
+++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php
@@ -46,8 +46,8 @@ class ConverterTest extends  TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->databaseConnection = $this->getMockBuilder('OCP\IDBConnection')->getMock();
-		$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
+		$this->databaseConnection = $this->getMockBuilder(IDBConnection::class)->getMock();
+		$this->eventDispatcher = $this->getMockBuilder(EventDispatcher::class)
 			->disableOriginalConstructor()->getMock();
 		$this->accountManager = $this->getMockBuilder(AccountManager::class)
 			->disableOriginalConstructor()->getMock();
diff --git a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
index 8536deb8e6e66766f58f4004b3b3d08aa26acd91..4d4070511bb2ff27936d679ff1a4b3172ed23ec9 100644
--- a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
+++ b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
@@ -47,7 +47,7 @@ class PluginTest extends TestCase {
 		parent::setUp();
 		
 		/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */
-		$authBackend = $this->getMockBuilder('OCA\DAV\Connector\Sabre\Auth')->disableOriginalConstructor()->getMock();
+		$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock();
 		$authBackend->method('isDavAuthenticated')->willReturn(true);
 
 		/** @var IRequest $request */
@@ -57,7 +57,7 @@ class PluginTest extends TestCase {
 		$root = new SimpleCollection('root');
 		$this->server = new \Sabre\DAV\Server($root);
 		/** @var SimpleCollection $node */
-		$this->book = $this->getMockBuilder('OCA\DAV\DAV\Sharing\IShareable')->disableOriginalConstructor()->getMock();
+		$this->book = $this->getMockBuilder(IShareable::class)->disableOriginalConstructor()->getMock();
 		$this->book->method('getName')->willReturn('addressbook1.vcf');
 		$root->addChild($this->book);
 		$this->plugin->initialize($this->server);
diff --git a/apps/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
index 57a15a6dc768daf216f9d308e7555317d2e86671..a0ff029efa7ce90a69d7b841e64d6fa313c92ad4 100644
--- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
@@ -33,6 +33,7 @@ use OCP\ILogger;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use Sabre\DAV\PropPatch;
 
 class CommentsNodeTest extends \Test\TestCase {
 
@@ -361,7 +362,7 @@ class CommentsNodeTest extends \Test\TestCase {
 	}
 
 	public function testPropPatch() {
-		$propPatch = $this->getMockBuilder('Sabre\DAV\PropPatch')
+		$propPatch = $this->getMockBuilder(PropPatch::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/dav/tests/unit/Connector/PublicAuthTest.php b/apps/dav/tests/unit/Connector/PublicAuthTest.php
index 90401e03853116b2769d08c78bd89c7454bd7395..dbb39bac6d2ba0a35f2a136cfaca99c113a705aa 100644
--- a/apps/dav/tests/unit/Connector/PublicAuthTest.php
+++ b/apps/dav/tests/unit/Connector/PublicAuthTest.php
@@ -28,6 +28,7 @@ use OCP\IRequest;
 use OCP\ISession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
+use OCP\Share\IShare;
 
 /**
  * Class PublicAuthTest
@@ -94,7 +95,7 @@ class PublicAuthTest extends \Test\TestCase {
 	}
 
 	public function testShareNoPassword() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn(null);
@@ -109,7 +110,7 @@ class PublicAuthTest extends \Test\TestCase {
 	}
 
 	public function testSharePasswordFancyShareType() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
@@ -126,7 +127,7 @@ class PublicAuthTest extends \Test\TestCase {
 
 
 	public function testSharePasswordRemote() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
@@ -142,7 +143,7 @@ class PublicAuthTest extends \Test\TestCase {
 	}
 
 	public function testSharePasswordLinkValidPassword() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
@@ -164,7 +165,7 @@ class PublicAuthTest extends \Test\TestCase {
 	}
 
 	public function testSharePasswordMailValidPassword() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
@@ -186,7 +187,7 @@ class PublicAuthTest extends \Test\TestCase {
 	}
 
 	public function testSharePasswordLinkValidSession() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
@@ -212,7 +213,7 @@ class PublicAuthTest extends \Test\TestCase {
 	}
 
 	public function testSharePasswordLinkInvalidSession() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
@@ -239,7 +240,7 @@ class PublicAuthTest extends \Test\TestCase {
 
 
 	public function testSharePasswordMailInvalidSession() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')
+		$share = $this->getMockBuilder(IShare::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$share->method('getPassword')->willReturn('password');
diff --git a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
index c02bd5046d8b063efcdf06da36740daebb0753fd..c31a3af980b833b9147221939866141e9d0d636a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
@@ -29,6 +29,7 @@ use OCA\DAV\Connector\Sabre\File;
 use OCP\Comments\ICommentsManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use Sabre\DAV\PropFind;
 
 class CommentsPropertiesPluginTest extends \Test\TestCase {
 
@@ -77,7 +78,7 @@ class CommentsPropertiesPluginTest extends \Test\TestCase {
 	 * @param $expectedSuccessful
 	 */
 	public function testHandleGetProperties($node, $expectedSuccessful) {
-		$propFind = $this->getMockBuilder('\Sabre\DAV\PropFind')
+		$propFind = $this->getMockBuilder(PropFind::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
index 773d5d7f98b63b4939214356f4ae88c2a232c93f..f44a4abf634f813f6f214821e02db29fb75890da 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
@@ -24,7 +24,9 @@
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin;
+use OCA\DAV\Connector\Sabre\File;
 use Sabre\DAV\Server;
+use Sabre\DAV\Tree;
 use Test\TestCase;
 
 /**
@@ -68,13 +70,13 @@ class CopyEtagHeaderPluginTest extends TestCase {
 	}
 
 	public function testAfterMove() {
-		$node = $this->getMockBuilder('OCA\DAV\Connector\Sabre\File')
+		$node = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
 			->method('getETag')
 			->willReturn('123456');
-		$tree = $this->getMockBuilder('Sabre\DAV\Tree')
+		$tree = $this->getMockBuilder(Tree::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tree->expects($this->once())
diff --git a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
index 4f51c25741bac73f0e6952ee572a1bec21505aa1..c96915244f7ad611cef0da977942eb2dc389ed55 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
@@ -31,8 +31,9 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
  * See the COPYING-README file.
  */
 
+use OCA\DAV\Connector\Sabre\Directory;
+use OCA\DAV\Connector\Sabre\File;
 use OCP\IUser;
-use Sabre\DAV\File;
 use Sabre\DAV\Tree;
 
 /**
@@ -179,7 +180,7 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 	 * Test setting/getting properties
 	 */
 	public function testSetGetPropertiesForFile() {
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		$node = $this->createTestNode(File::class);
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/dummypath')
@@ -211,7 +212,7 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 	 * Test getting properties from directory
 	 */
 	public function testGetPropertiesForDirectory() {
-		$rootNode = $this->createTestNode('\OCA\DAV\Connector\Sabre\Directory');
+		$rootNode = $this->createTestNode(Directory::class);
 
 		$nodeSub = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
@@ -295,7 +296,7 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 	 * Test delete property
 	 */
 	public function testDeleteProperty() {
-		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
+		$node = $this->createTestNode(File::class);
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/dummypath')
diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
index f27f67b0aaede3b31da50f589576887fc1034795..d5da0dce0d11681f531d60680717d3b9d492c2ff 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -26,6 +26,7 @@
 
 namespace OCA\DAV\Tests\Unit\Connector\Sabre;
 
+use OC\Files\Storage\Wrapper\Quota;
 use OCP\Files\ForbiddenException;
 use OC\Files\FileInfo;
 use OCA\DAV\Connector\Sabre\Directory;
@@ -179,10 +180,10 @@ class DirectoryTest extends \Test\TestCase {
 	}
 
 	public function testGetChildren() {
-		$info1 = $this->getMockBuilder('OC\Files\FileInfo')
+		$info1 = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$info2 = $this->getMockBuilder('OC\Files\FileInfo')
+		$info2 = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$info1->expects($this->any())
@@ -269,7 +270,7 @@ class DirectoryTest extends \Test\TestCase {
 	}
 
 	public function testGetQuotaInfoUnlimited() {
-		$storage = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Quota')
+		$storage = $this->getMockBuilder(Quota::class)
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -300,7 +301,7 @@ class DirectoryTest extends \Test\TestCase {
 	}
 
 	public function testGetQuotaInfoSpecific() {
-		$storage = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Quota')
+		$storage = $this->getMockBuilder(Quota::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
index f16c374a0e1433826b6012945ceb001f56c3cad0..fa6f849f12fce481f2c0842c90ec66e8184122fe 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
@@ -27,6 +27,8 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OCA\DAV\Connector\Sabre\DummyGetResponsePlugin;
 use Sabre\DAV\Server;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 use Test\TestCase;
 
 /**
@@ -60,11 +62,11 @@ class DummyGetResponsePluginTest extends TestCase {
 
 	public function testHttpGet() {
 		/** @var \Sabre\HTTP\RequestInterface $request */
-		$request = $this->getMockBuilder('\Sabre\HTTP\RequestInterface')
+		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 		/** @var \Sabre\HTTP\ResponseInterface $response */
-		$response = $server = $this->getMockBuilder('\Sabre\HTTP\ResponseInterface')
+		$response = $server = $this->getMockBuilder(ResponseInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$response
diff --git a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
index 1fd2b05c23d30a19e975a632b574b2976659a5f9..e42bb1704f0d86a844eb6bf3249b7b12c5387089 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
@@ -26,8 +26,11 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OCA\DAV\Connector\Sabre\FakeLockerPlugin;
 use Sabre\DAV\INode;
+use Sabre\DAV\PropFind;
 use Sabre\DAV\Server;
+use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\Response;
+use Sabre\HTTP\ResponseInterface;
 use Test\TestCase;
 
 /**
@@ -85,7 +88,7 @@ class FakeLockerPluginTest extends TestCase {
 	}
 
 	public function testPropFind() {
-		$propFind = $this->getMockBuilder('\Sabre\DAV\PropFind')
+		$propFind = $this->getMockBuilder(PropFind::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node = $this->getMockBuilder(INode::class)
@@ -145,7 +148,7 @@ class FakeLockerPluginTest extends TestCase {
 	 * @param array $expected
 	 */
 	public function testValidateTokens(array $input, array $expected) {
-		$request = $this->getMockBuilder('\Sabre\HTTP\RequestInterface')
+		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->fakeLockerPlugin->validateTokens($request, $input);
@@ -153,7 +156,7 @@ class FakeLockerPluginTest extends TestCase {
 	}
 
 	public function testFakeLockProvider() {
-		$request = $this->getMockBuilder('\Sabre\HTTP\RequestInterface')
+		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$response = new Response();
@@ -173,10 +176,10 @@ class FakeLockerPluginTest extends TestCase {
 	}
 
 	public function testFakeUnlockProvider() {
-		$request = $this->getMockBuilder('\Sabre\HTTP\RequestInterface')
+		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$response = $this->getMockBuilder('\Sabre\HTTP\ResponseInterface')
+		$response = $this->getMockBuilder(ResponseInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
index 3a2075941aeeb0c9f93c8a6088731761ce231738..bf9daebdc5b86b45cbcc8c620a11698f93d6459c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -882,7 +882,7 @@ class FileTest extends \Test\TestCase {
 
 		$wasLockedPre = false;
 		$wasLockedPost = false;
-		$eventHandler = $this->getMockBuilder('\stdclass')
+		$eventHandler = $this->getMockBuilder(\stdclass::class)
 			->setMethods(['writeCallback', 'postWriteCallback'])
 			->getMock();
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index a33ece3c4b3cc14e0614f7b73730ce6d151c0021..e3cf1ff4453dfe80d7827d93872dc8caf6042893 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -25,8 +25,10 @@
  */
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
+use OC\User\User;
 use OCA\DAV\Connector\Sabre\File;
 use OCA\DAV\Connector\Sabre\FilesPlugin;
+use OCA\DAV\Connector\Sabre\Node;
 use OCP\Files\StorageNotAvailableException;
 use OCP\IConfig;
 use OCP\IPreview;
@@ -188,7 +190,7 @@ class FilesPluginTest extends TestCase {
 			0
 		);
 
-		$user = $this->getMockBuilder('\OC\User\User')
+		$user = $this->getMockBuilder(User::class)
 			->disableOriginalConstructor()->getMock();
 		$user
 			->expects($this->once())
@@ -457,14 +459,14 @@ class FilesPluginTest extends TestCase {
 	 * @expectedExceptionMessage FolderA/test.txt cannot be deleted
 	 */
 	public function testMoveSrcNotDeletable() {
-		$fileInfoFolderATestTXT = $this->getMockBuilder('\OCP\Files\FileInfo')
+		$fileInfoFolderATestTXT = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$fileInfoFolderATestTXT->expects($this->once())
 			->method('isDeletable')
 			->willReturn(false);
 
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
@@ -478,14 +480,14 @@ class FilesPluginTest extends TestCase {
 	}
 
 	public function testMoveSrcDeletable() {
-		$fileInfoFolderATestTXT = $this->getMockBuilder('\OCP\Files\FileInfo')
+		$fileInfoFolderATestTXT = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$fileInfoFolderATestTXT->expects($this->once())
 			->method('isDeletable')
 			->willReturn(true);
 
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
@@ -503,7 +505,7 @@ class FilesPluginTest extends TestCase {
 	 * @expectedExceptionMessage FolderA/test.txt does not exist
 	 */
 	public function testMoveSrcNotExist() {
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
index 374557c6b67699717fc1bc0eeeea1ee4e19cc04d..c46e4b148050750c45c89e47256e31163541c61e 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -33,6 +33,7 @@ use OCP\IRequest;
 use OCP\ITagManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\ISystemTagObjectMapper;
 use OC\Files\View;
 use OCP\Files\Folder;
@@ -550,7 +551,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->method('isAdmin')
 			->will($this->returnValue(true));
 
-		$tag1 = $this->getMockBuilder('\OCP\SystemTag\ISystemTag')
+		$tag1 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag1->expects($this->any())
@@ -560,7 +561,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->method('isUserVisible')
 			->will($this->returnValue(true));
 
-		$tag2 = $this->getMockBuilder('\OCP\SystemTag\ISystemTag')
+		$tag2 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag2->expects($this->any())
@@ -599,7 +600,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->method('isAdmin')
 			->will($this->returnValue(false));
 
-		$tag1 = $this->getMockBuilder('\OCP\SystemTag\ISystemTag')
+		$tag1 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag1->expects($this->any())
@@ -609,7 +610,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->method('isUserVisible')
 			->will($this->returnValue(true));
 
-		$tag2 = $this->getMockBuilder('\OCP\SystemTag\ISystemTag')
+		$tag2 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag2->expects($this->any())
@@ -637,7 +638,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->method('isAdmin')
 			->will($this->returnValue(false));
 
-		$tag1 = $this->getMockBuilder('\OCP\SystemTag\ISystemTag')
+		$tag1 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag1->expects($this->any())
@@ -647,7 +648,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->method('isUserVisible')
 			->will($this->returnValue(true));
 
-		$tag2 = $this->getMockBuilder('\OCP\SystemTag\ISystemTag')
+		$tag2 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag2->expects($this->any())
diff --git a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
index e7ab94ac926e9f14dfc5b2ecf66cc0043467b402..fe6cbd97829eb6edee1638fc041c1c3d43bb2681 100644
--- a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
@@ -25,8 +25,12 @@
  */
 
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
+use OC\Files\FileInfo;
 use OC\Files\View;
+use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage;
+use OCP\Share\IManager;
+use OCP\Share\IShare;
 
 /**
  * Class NodeTest
@@ -53,7 +57,7 @@ class NodeTest extends \Test\TestCase {
 	 * @dataProvider davPermissionsProvider
 	 */
 	public function testDavPermissions($permissions, $type, $shared, $mounted, $expected) {
-		$info = $this->getMockBuilder('\OC\Files\FileInfo')
+		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->setMethods(array('getPermissions', 'isShared', 'isMounted', 'getType'))
 			->getMock();
@@ -126,12 +130,12 @@ class NodeTest extends \Test\TestCase {
 			->getMock();
 		$storage->method('getPermissions')->willReturn($permissions);
 
-		$mountpoint = $this->getMockBuilder('\OCP\Files\Mount\IMountPoint')
+		$mountpoint = $this->getMockBuilder(IMountPoint::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$mountpoint->method('getMountPoint')->willReturn('myPath');
-		$shareManager = $this->getMockBuilder('OCP\Share\IManager')->disableOriginalConstructor()->getMock();
-		$share = $this->getMockBuilder('OCP\Share\IShare')->disableOriginalConstructor()->getMock();
+		$shareManager = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock();
+		$share = $this->getMockBuilder(IShare::class)->disableOriginalConstructor()->getMock();
 
 		if ($user === null) {
 			$shareManager->expects($this->never())->method('getShareByToken');
@@ -142,7 +146,7 @@ class NodeTest extends \Test\TestCase {
 			$share->expects($this->once())->method('getPermissions')->willReturn($permissions);
 		}
 
-		$info = $this->getMockBuilder('\OC\Files\FileInfo')
+		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->setMethods(['getStorage', 'getType', 'getMountPoint'])
 			->getMock();
diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index c9c55adc9e8c530afbe141f63f827a442b30ecd9..d1b37541dc34528deef6cd222fe40e7c19f8595d 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -31,6 +31,7 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OC\Files\FileInfo;
 use OC\Files\Filesystem;
+use OC\Files\Mount\Manager;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 use OCA\DAV\Connector\Sabre\Directory;
@@ -159,13 +160,13 @@ class ObjectTreeTest extends \Test\TestCase {
 		$rootNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$mountManager = $this->getMockBuilder('\OC\Files\Mount\Manager')
+		$mountManager = $this->getMockBuilder(Manager::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$view = $this->getMockBuilder(View::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$fileInfo = $this->getMockBuilder('\OCP\Files\FileInfo')
+		$fileInfo = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$fileInfo->expects($this->once())
@@ -287,7 +288,7 @@ class ObjectTreeTest extends \Test\TestCase {
 		$rootNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$mountManager = $this->getMockBuilder('\OC\Files\Mount\Manager')
+		$mountManager = $this->getMockBuilder(Manager::class)
 			->getMock();
 
 		$tree = new \OCA\DAV\Connector\Sabre\ObjectTree();
@@ -314,7 +315,7 @@ class ObjectTreeTest extends \Test\TestCase {
 		$rootNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$mountManager = $this->getMockBuilder('\OC\Files\Mount\Manager')
+		$mountManager = $this->getMockBuilder(Manager::class)
 			->getMock();
 
 		$tree = new \OCA\DAV\Connector\Sabre\ObjectTree();
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index d29080539e60cc364173a1bf7ec138d6e2a5165d..927178996c91165d2059c5760cf322b9512fd390 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -176,7 +176,7 @@ class QuotaPluginTest extends TestCase {
 	public function testCheckQuotaChunkedOk($quota, $chunkTotalSize, $headers) {
 		$this->init($quota, 'sub/test.txt');
 
-		$mockChunking = $this->getMockBuilder('\OC_FileChunking')
+		$mockChunking = $this->getMockBuilder(\OC_FileChunking::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$mockChunking->expects($this->once())
@@ -212,7 +212,7 @@ class QuotaPluginTest extends TestCase {
 	public function testCheckQuotaChunkedFail($quota, $chunkTotalSize, $headers) {
 		$this->init($quota, 'sub/test.txt');
 
-		$mockChunking = $this->getMockBuilder('\OC_FileChunking')
+		$mockChunking = $this->getMockBuilder(\OC_FileChunking::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$mockChunking->expects($this->once())
diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
index 7c735ca233435884d5535dc3580a4c2090732469..57be6e5a9e212a7b94fde7de333cda0bb52ad106 100644
--- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
@@ -25,10 +25,12 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\File;
+use OCA\DAV\Connector\Sabre\Node;
 use OCP\Files\Folder;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Share\IManager;
+use OCP\Share\IShare;
 use Sabre\DAV\Tree;
 
 class SharesPluginTest extends \Test\TestCase {
@@ -99,7 +101,7 @@ class SharesPluginTest extends \Test\TestCase {
 	 * @dataProvider sharesGetPropertiesDataProvider
 	 */
 	public function testGetProperties($shareTypes) {
-		$sabreNode = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$sabreNode = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$sabreNode->expects($this->any())
@@ -214,7 +216,7 @@ class SharesPluginTest extends \Test\TestCase {
 			->will($this->returnValue($node));
 		
 		$dummyShares = array_map(function($type) {
-			$share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+			$share = $this->getMockBuilder(IShare::class)->getMock();
 			$share->expects($this->any())
 				->method('getShareType')
 				->will($this->returnValue($type));
diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
index 48d02cad690abf4173a7033f75262981b0475933..af156310887de237bee0b769c58a2b488c2fc308 100644
--- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
@@ -26,6 +26,9 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\File;
+use OCA\DAV\Connector\Sabre\Node;
+use OCP\ITagManager;
+use OCP\ITags;
 use Sabre\DAV\Tree;
 
 /**
@@ -71,10 +74,10 @@ class TagsPluginTest extends \Test\TestCase {
 		$this->tree = $this->getMockBuilder(Tree::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$this->tagger = $this->getMockBuilder('\OCP\ITags')
+		$this->tagger = $this->getMockBuilder(ITags::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$this->tagManager = $this->getMockBuilder('\OCP\ITagManager')
+		$this->tagManager = $this->getMockBuilder(ITagManager::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->tagManager->expects($this->any())
@@ -89,7 +92,7 @@ class TagsPluginTest extends \Test\TestCase {
 	 * @dataProvider tagsGetPropertiesDataProvider
 	 */
 	public function testGetProperties($tags, $requestedProperties, $expectedProperties) {
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -264,7 +267,7 @@ class TagsPluginTest extends \Test\TestCase {
 	public function testUpdateTags() {
 		// this test will replace the existing tags "tagremove" with "tag1" and "tag2"
 		// and keep "tagkeep"
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -315,7 +318,7 @@ class TagsPluginTest extends \Test\TestCase {
 	}
 
 	public function testUpdateTagsFromScratch() {
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -363,7 +366,7 @@ class TagsPluginTest extends \Test\TestCase {
 	public function testUpdateFav() {
 		// this test will replace the existing tags "tagremove" with "tag1" and "tag2"
 		// and keep "tagkeep"
-		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
+		$node = $this->getMockBuilder(Node::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
diff --git a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
index cdeaceefedf2eff5a013a563f39a9f30196782ea..32f19e9ddb9d6180556ce0498ecc94ac1d22d65e 100644
--- a/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
+++ b/apps/dav/tests/unit/DAV/BrowserErrorPagePluginTest.php
@@ -26,6 +26,7 @@ namespace OCA\DAV\Tests\unit\DAV;
 use OCA\DAV\Files\BrowserErrorPagePlugin;
 use PHPUnit_Framework_MockObject_MockObject;
 use Sabre\DAV\Exception\NotFound;
+use Sabre\HTTP\Response;
 
 class BrowserErrorPagePluginTest extends \Test\TestCase {
 
@@ -36,13 +37,13 @@ class BrowserErrorPagePluginTest extends \Test\TestCase {
 	 */
 	public function test($expectedCode, $exception) {
 		/** @var BrowserErrorPagePlugin | PHPUnit_Framework_MockObject_MockObject $plugin */
-		$plugin = $this->getMockBuilder('OCA\DAV\Files\BrowserErrorPagePlugin')->setMethods(['sendResponse', 'generateBody'])->getMock();
+		$plugin = $this->getMockBuilder(BrowserErrorPagePlugin::class)->setMethods(['sendResponse', 'generateBody'])->getMock();
 		$plugin->expects($this->once())->method('generateBody')->willReturn(':boom:');
 		$plugin->expects($this->once())->method('sendResponse');
 		/** @var \Sabre\DAV\Server | PHPUnit_Framework_MockObject_MockObject $server */
 		$server = $this->getMockBuilder('Sabre\DAV\Server')->disableOriginalConstructor()->getMock();
 		$server->expects($this->once())->method('on');
-		$httpResponse = $this->getMockBuilder('Sabre\HTTP\Response')->disableOriginalConstructor()->getMock();
+		$httpResponse = $this->getMockBuilder(Response::class)->disableOriginalConstructor()->getMock();
 		$httpResponse->expects($this->once())->method('addHeaders');
 		$httpResponse->expects($this->once())->method('setStatus')->with($expectedCode);
 		$httpResponse->expects($this->once())->method('setBody')->with(':boom:');
diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php
index a78ffea5af48ded28f821691fae5bfb19f488725..3296d550a6b7de9cd24d11611331f9010ef6900d 100644
--- a/apps/dav/tests/unit/DAV/HookManagerTest.php
+++ b/apps/dav/tests/unit/DAV/HookManagerTest.php
@@ -42,7 +42,7 @@ class HookManagerTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')->disableOriginalConstructor()->getMock();
+		$this->eventDispatcher = $this->getMockBuilder(EventDispatcher::class)->disableOriginalConstructor()->getMock();
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->l10n
 			->expects($this->any())
diff --git a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
index 1a9015c6cbbbbf1d4d4210db01e4bf89af6a1708..d6291467e47fef4d7c1e5bd177268b997ff26fa8 100644
--- a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
+++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php
@@ -47,7 +47,7 @@ class PluginTest extends TestCase {
 		parent::setUp();
 		
 		/** @var Auth | \PHPUnit_Framework_MockObject_MockObject $authBackend */
-		$authBackend = $this->getMockBuilder('OCA\DAV\Connector\Sabre\Auth')->disableOriginalConstructor()->getMock();
+		$authBackend = $this->getMockBuilder(Auth::class)->disableOriginalConstructor()->getMock();
 		$authBackend->method('isDavAuthenticated')->willReturn(true);
 
 		/** @var IRequest $request */
@@ -57,7 +57,7 @@ class PluginTest extends TestCase {
 		$root = new SimpleCollection('root');
 		$this->server = new \Sabre\DAV\Server($root);
 		/** @var SimpleCollection $node */
-		$this->book = $this->getMockBuilder('OCA\DAV\DAV\Sharing\IShareable')->
+		$this->book = $this->getMockBuilder(IShareable::class)->
 			disableOriginalConstructor()->
 			getMock();
 		$this->book->method('getName')->willReturn('addressbook1.vcf');
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
index ac4e901643464b2c73f7e0614edcc90e379b1a61..f67160af8d0e7fa8c346648a74d020d48c00ad17 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
@@ -26,6 +26,8 @@ namespace OCA\DAV\Tests\unit\SystemTag;
 
 use OC\SystemTag\SystemTag;
 use OCP\IUser;
+use OCP\SystemTag\ISystemTagManager;
+use OCP\SystemTag\ISystemTagObjectMapper;
 use OCP\SystemTag\TagNotFoundException;
 use OCP\SystemTag\ISystemTag;
 
@@ -49,9 +51,9 @@ class SystemTagMappingNodeTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->tagManager = $this->getMockBuilder('\OCP\SystemTag\ISystemTagManager')
+		$this->tagManager = $this->getMockBuilder(ISystemTagManager::class)
 			->getMock();
-		$this->tagMapper = $this->getMockBuilder('\OCP\SystemTag\ISystemTagObjectMapper')
+		$this->tagMapper = $this->getMockBuilder(ISystemTagObjectMapper::class)
 			->getMock();
 		$this->user = $this->getMockBuilder(IUser::class)
 			->getMock();
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
index e50c3d307588285e8cb65398097afd233077fe95..dd6892fe6ea84b5d1a62e85891fa1e84c580da8f 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
@@ -27,6 +27,7 @@ namespace OCA\DAV\Tests\unit\SystemTag;
 
 use OC\SystemTag\SystemTag;
 use OCP\IUser;
+use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\TagNotFoundException;
 use OCP\SystemTag\TagAlreadyExistsException;
 use OCP\SystemTag\ISystemTag;
@@ -47,7 +48,7 @@ class SystemTagNodeTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->tagManager = $this->getMockBuilder('\OCP\SystemTag\ISystemTagManager')
+		$this->tagManager = $this->getMockBuilder(ISystemTagManager::class)
 			->getMock();
 		$this->user = $this->getMockBuilder(IUser::class)
 			->getMock();
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
index f1c18cf45a3898977e4a8475f5cc54736855a395..b231577845c6207ba968b2af92b5e53aa968a852 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
@@ -27,8 +27,12 @@
 namespace OCA\DAV\Tests\unit\SystemTag;
 
 use OC\SystemTag\SystemTag;
+use OCA\DAV\SystemTag\SystemTagNode;
+use OCA\DAV\SystemTag\SystemTagsByIdCollection;
+use OCA\DAV\SystemTag\SystemTagsObjectMappingCollection;
 use OCP\IGroupManager;
 use OCP\IUserSession;
+use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\TagAlreadyExistsException;
 use OCP\IUser;
 use OCP\SystemTag\ISystemTag;
@@ -88,7 +92,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$this->server = new \Sabre\DAV\Server($this->tree);
 
-		$this->tagManager = $this->getMockBuilder('\OCP\SystemTag\ISystemTagManager')
+		$this->tagManager = $this->getMockBuilder(ISystemTagManager::class)
 			->getMock();
 		$this->groupManager = $this->getMockBuilder(IGroupManager::class)
 			->getMock();
@@ -192,7 +196,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->with('admin')
 			->willReturn(true);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagNode')
+		$node = $this->getMockBuilder(SystemTagNode::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -247,7 +251,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->with('admin')
 			->willReturn(false);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagNode')
+		$node = $this->getMockBuilder(SystemTagNode::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -282,7 +286,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->with('admin')
 			->willReturn(true);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagNode')
+		$node = $this->getMockBuilder(SystemTagNode::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -340,7 +344,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->with('admin')
 			->willReturn(false);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagNode')
+		$node = $this->getMockBuilder(SystemTagNode::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->any())
@@ -403,7 +407,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 		}
 		$requestData = json_encode($requestData);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagsByIdCollection')
+		$node = $this->getMockBuilder(SystemTagsByIdCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->tagManager->expects($this->never())
@@ -448,7 +452,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 			'userAssignable' => true,
 		]);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagsByIdCollection')
+		$node = $this->getMockBuilder(SystemTagsByIdCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->tagManager->expects($this->once())
@@ -525,7 +529,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 		}
 		$requestData = json_encode($requestData);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagsByIdCollection')
+		$node = $this->getMockBuilder(SystemTagsByIdCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->tagManager->expects($this->once())
@@ -604,7 +608,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 			'userAssignable' => false,
 		]);
 
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagsObjectMappingCollection')
+		$node = $this->getMockBuilder(SystemTagsObjectMappingCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -657,7 +661,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 	 * @expectedException \Sabre\DAV\Exception\NotFound
 	 */
 	public function testCreateTagToUnknownNode() {
-		$node = $this->getMockBuilder('\OCA\DAV\SystemTag\SystemTagsObjectMappingCollection')
+		$node = $this->getMockBuilder(SystemTagsObjectMappingCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
index 53f54e19f0a0ebb1d4aef6845ca223edafccdc1a..ec52de0536a88afd7549a557ad3fcd3ca4c4b59d 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
@@ -29,6 +29,7 @@ use OC\SystemTag\SystemTag;
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\TagNotFoundException;
 
 class SystemTagsByIdCollectionTest extends \Test\TestCase {
@@ -46,7 +47,7 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->tagManager = $this->getMockBuilder('\OCP\SystemTag\ISystemTagManager')
+		$this->tagManager = $this->getMockBuilder(ISystemTagManager::class)
 			->getMock();
 	}
 
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
index 61f94c9e60bd94d336fa30fd0cc78ba4ee245831..f99e4df1f6954b46d882280271d26329bbc64a63 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
@@ -27,6 +27,8 @@ namespace OCA\DAV\Tests\unit\SystemTag;
 
 use OC\SystemTag\SystemTag;
 use OCP\IUser;
+use OCP\SystemTag\ISystemTagManager;
+use OCP\SystemTag\ISystemTagObjectMapper;
 use OCP\SystemTag\TagNotFoundException;
 
 class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
@@ -49,9 +51,9 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->tagManager = $this->getMockBuilder('\OCP\SystemTag\ISystemTagManager')
+		$this->tagManager = $this->getMockBuilder(ISystemTagManager::class)
 			->getMock();
-		$this->tagMapper = $this->getMockBuilder('\OCP\SystemTag\ISystemTagObjectMapper')
+		$this->tagMapper = $this->getMockBuilder(ISystemTagObjectMapper::class)
 			->getMock();
 
 		$this->user = $this->getMockBuilder(IUser::class)
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
index e3de7db1584adf28d1001ca677c6f6dfa7f7ae00..0dc7ace2b892085fd2021403ea9d3d259a2ca4da 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
@@ -28,6 +28,8 @@ use OCP\Files\Folder;
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\SystemTag\ISystemTagManager;
+use OCP\SystemTag\ISystemTagObjectMapper;
 
 class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 
@@ -54,9 +56,9 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->tagManager = $this->getMockBuilder('\OCP\SystemTag\ISystemTagManager')
+		$this->tagManager = $this->getMockBuilder(ISystemTagManager::class)
 			->getMock();
-		$this->tagMapper = $this->getMockBuilder('\OCP\SystemTag\ISystemTagObjectMapper')
+		$this->tagMapper = $this->getMockBuilder(ISystemTagObjectMapper::class)
 			->getMock();
 
 		$user = $this->getMockBuilder(IUser::class)
diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
index 69ee52299e9e2da1274d4076332036776174c139..0396f80c9f46d63fc5c888a43ca1a99f0fe38b7d 100644
--- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
+++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php
@@ -23,6 +23,8 @@
  */
 namespace OCA\DAV\Tests\unit\Upload;
 
+use Sabre\DAV\File;
+
 class AssemblyStreamTest extends \Test\TestCase {
 
 	/**
@@ -120,7 +122,7 @@ class AssemblyStreamTest extends \Test\TestCase {
 	}
 
 	private function buildNode($name, $data) {
-		$node = $this->getMockBuilder('\Sabre\DAV\File')
+		$node = $this->getMockBuilder(File::class)
 			->setMethods(['getName', 'get', 'getSize'])
 			->getMockForAbstractClass();
 
diff --git a/apps/dav/tests/unit/Upload/FutureFileTest.php b/apps/dav/tests/unit/Upload/FutureFileTest.php
index d94f14ab0974ae702e149b0fdbdfb5c5e476578a..1066991253048acc314532bb99359d67a5562925 100644
--- a/apps/dav/tests/unit/Upload/FutureFileTest.php
+++ b/apps/dav/tests/unit/Upload/FutureFileTest.php
@@ -23,6 +23,8 @@
  */
 namespace OCA\DAV\Tests\unit\Upload;
 
+use OCA\DAV\Connector\Sabre\Directory;
+
 class FutureFileTest extends \Test\TestCase {
 
 	public function testGetContentType() {
@@ -57,7 +59,7 @@ class FutureFileTest extends \Test\TestCase {
 	}
 
 	public function testDelete() {
-		$d = $this->getMockBuilder('OCA\DAV\Connector\Sabre\Directory')
+		$d = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->setMethods(['delete'])
 			->getMock();
@@ -89,7 +91,7 @@ class FutureFileTest extends \Test\TestCase {
 	 * @return \OCA\DAV\Upload\FutureFile
 	 */
 	private function mockFutureFile() {
-		$d = $this->getMockBuilder('OCA\DAV\Connector\Sabre\Directory')
+		$d = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->setMethods(['getETag', 'getLastModified', 'getChildren'])
 			->getMock();
diff --git a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
index b5ea08af8d5f2950efae985308acd190a172e1c6..a565102a0887fc4098afb5c76ef272541a6ee1b2 100644
--- a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
+++ b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php
@@ -89,7 +89,7 @@ class MountPublicLinkControllerTest extends \Test\TestCase {
 		$this->request = $this->getMockBuilder(IRequest::class)->disableOriginalConstructor()->getMock();
 		$this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider')
 			->disableOriginalConstructor()->getMock();
-		$this->shareManager = $this->getMockBuilder('OCP\Share\IManager')->disableOriginalConstructor()->getMock();
+		$this->shareManager = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock();
 		$this->addressHandler = $this->getMockBuilder('OCA\FederatedFileSharing\AddressHandler')
 			->disableOriginalConstructor()->getMock();
 		$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->disableOriginalConstructor()->getMock();
diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
index 538c6ae5a082bff698507555b015a1ab41d61589..585102d687adec1d783a2f01eebe7eb2750432b6 100644
--- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
+++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
@@ -90,7 +90,7 @@ class RequestHandlerControllerTest extends TestCase {
 				->setConstructorArgs([$config, $clientService])
 				->getMock();
 		$httpHelperMock->expects($this->any())->method('post')->with($this->anything())->will($this->returnValue(true));
-		$this->share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$this->share = $this->getMockBuilder(IShare::class)->getMock();
 		$this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider')
 			->disableOriginalConstructor()->getMock();
 		$this->federatedShareProvider->expects($this->any())
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index 14852b3354fb4cbd859a20303da6f9ea35c29e8e..e73ebb62c6a1bffadc89fceffc2f499f76654736 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -230,7 +230,7 @@ class ShareAPIControllerTest extends TestCase {
 	public function createShare($id, $shareType, $sharedWith, $sharedBy, $shareOwner, $path, $permissions,
 								$shareTime, $expiration, $parent, $target, $mail_send, $token=null,
 								$password=null) {
-		$share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getId')->willReturn($id);
 		$share->method('getShareType')->willReturn($shareType);
 		$share->method('getSharedWith')->willReturn($sharedWith);
@@ -513,25 +513,25 @@ class ShareAPIControllerTest extends TestCase {
 	}
 
 	public function testCanAccessShare() {
-		$share = $this->getMockBuilder('OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getShareOwner')->willReturn($this->currentUser);
 		$this->assertTrue($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
-		$share = $this->getMockBuilder('OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getSharedBy')->willReturn($this->currentUser);
 		$this->assertTrue($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
-		$share = $this->getMockBuilder('OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_USER);
 		$share->method('getSharedWith')->willReturn($this->currentUser);
 		$this->assertTrue($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
-		$share = $this->getMockBuilder('OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_USER);
 		$share->method('getSharedWith')->willReturn($this->getMockBuilder(IUser::class)->getMock());
 		$this->assertFalse($this->invokePrivate($this->ocs, 'canAccessShare', [$share]));
 
-		$share = $this->getMockBuilder('OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_GROUP);
 		$share->method('getSharedWith')->willReturn('group');
 
diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
index d1b30d77f32d7a7cfecaeb7e3b78ca4eb6bd9b61..6f0b3f9c2da08c942814144638f879893666d0e1 100644
--- a/apps/files_sharing/tests/Controller/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -49,6 +49,7 @@ use OCP\ISession;
 use OCP\IUserManager;
 use OCP\Security\ISecureRandom;
 use OCP\IURLGenerator;
+use OCP\Share\IShare;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -463,7 +464,7 @@ class ShareControllerTest extends \Test\TestCase {
 	}
 
 	public function testDownloadShare() {
-		$share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getPassword')->willReturn('password');
 		$share
 			->expects($this->once())
@@ -488,7 +489,7 @@ class ShareControllerTest extends \Test\TestCase {
 	}
 
 	public function testDownloadShareWithCreateOnlyShare() {
-		$share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->method('getPassword')->willReturn('password');
 		$share
 			->expects($this->once())
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index 4cd202113ddc350145fff688646776f03a2b14d3..812a068f07075c7a58f713ba112a704d0c797707 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -682,7 +682,7 @@ class VersioningTest extends \Test\TestCase {
 			return;
 		}
 
-		$eventHandler = $this->getMockBuilder('\stdclass')
+		$eventHandler = $this->getMockBuilder(\stdclass::class)
 			->setMethods(['callback'])
 			->getMock();
 
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
index a04b0a355cf3fed1b0186c7da1e0ae14d1d10365..95d746cfb46a25dfedc3c6694ed7e7e016ec704d 100644
--- a/apps/sharebymail/tests/ShareByMailProviderTest.php
+++ b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -114,7 +114,7 @@ class ShareByMailProviderTest extends TestCase {
 		$this->secureRandom = $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock();
 		$this->mailer = $this->getMockBuilder('\OCP\Mail\IMailer')->getMock();
 		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->getMock();
-		$this->share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$this->share = $this->getMockBuilder(IShare::class)->getMock();
 		$this->activityManager = $this->getMockBuilder('OCP\Activity\IManager')->getMock();
 		$this->settingsManager = $this->getMockBuilder(SettingsManager::class)->disableOriginalConstructor()->getMock();
 		$this->defaults = $this->createMock(Defaults::class);
@@ -181,7 +181,7 @@ class ShareByMailProviderTest extends TestCase {
 	}
 
 	public function testCreate() {
-		$share = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$share = $this->getMockBuilder(IShare::class)->getMock();
 		$share->expects($this->any())->method('getSharedWith')->willReturn('user1');
 
 		$node = $this->getMockBuilder(File::class)->getMock();
diff --git a/tests/Settings/Controller/GroupsControllerTest.php b/tests/Settings/Controller/GroupsControllerTest.php
index 78df5f3a3cb11233b4b459e22ee5674882fbb203..ecbfa9ea05e0aaa6818d8ea55623f969f74636f3 100644
--- a/tests/Settings/Controller/GroupsControllerTest.php
+++ b/tests/Settings/Controller/GroupsControllerTest.php
@@ -13,6 +13,7 @@ namespace Tests\Settings\Controller;
 use OC\Group\Group;
 use OC\Group\MetaData;
 use OC\Settings\Controller\GroupsController;
+use OC\User\User;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IGroupManager;
@@ -99,7 +100,7 @@ class GroupsControllerTest extends \Test\TestCase {
 		$groups[] = $thirdGroup;
 		$groups[] = $fourthGroup;
 
-		$user = $this->getMockBuilder('\OC\User\User')
+		$user = $this->getMockBuilder(User::class)
 			->disableOriginalConstructor()->getMock();
 		$this->userSession
 			->expects($this->once())
@@ -191,7 +192,7 @@ class GroupsControllerTest extends \Test\TestCase {
 		$groups[] = $thirdGroup;
 		$groups[] = $fourthGroup;
 
-		$user = $this->getMockBuilder('\OC\User\User')
+		$user = $this->getMockBuilder(User::class)
 			->disableOriginalConstructor()->getMock();
 		$this->userSession
 			->expects($this->once())
diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php
index ccd2bb796fce3338f088198547b870b8ee562a88..a8cbef70d756b9171fb599f385960ce93ea06b7e 100644
--- a/tests/lib/Encryption/UpdateTest.php
+++ b/tests/lib/Encryption/UpdateTest.php
@@ -24,6 +24,7 @@ namespace Test\Encryption;
 
 
 use OC\Encryption\Update;
+use OC\Files\Mount\Manager;
 use OC\Files\View;
 use Test\TestCase;
 
@@ -60,7 +61,7 @@ class UpdateTest extends TestCase {
 			->disableOriginalConstructor()->getMock();
 		$this->util = $this->getMockBuilder('\OC\Encryption\Util')
 			->disableOriginalConstructor()->getMock();
-		$this->mountManager = $this->getMockBuilder('\OC\Files\Mount\Manager')
+		$this->mountManager = $this->getMockBuilder(Manager::class)
 			->disableOriginalConstructor()->getMock();
 		$this->encryptionManager = $this->getMockBuilder('\OC\Encryption\Manager')
 			->disableOriginalConstructor()->getMock();
diff --git a/tests/lib/FileChunkingTest.php b/tests/lib/FileChunkingTest.php
index cf0fed251a46ea57ca0aa137de93aa28ff5335a6..42fc820c5d06fd376d714935c2bf045fae9c941d 100644
--- a/tests/lib/FileChunkingTest.php
+++ b/tests/lib/FileChunkingTest.php
@@ -47,7 +47,7 @@ class FileChunkingTest extends \Test\TestCase {
 	 * @param $expected
 	 */
 	public function testIsComplete($total, array $present, $expected) {
-		$fileChunking = $this->getMockBuilder('\OC_FileChunking')
+		$fileChunking = $this->getMockBuilder(\OC_FileChunking::class)
 			->setMethods(['getCache'])
 			->setConstructorArgs([[
 				'name' => 'file',
diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php
index ec043c7b81e692df61ae8617ea79d0798c60346d..6479dad58d3304af1f172a6eb721ed1b9dfe0faf 100644
--- a/tests/lib/Files/Node/FolderTest.php
+++ b/tests/lib/Files/Node/FolderTest.php
@@ -786,7 +786,7 @@ class FolderTest extends NodeTest {
 			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
 			->getMock();
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\FileInfo $folderInfo */
-		$folderInfo = $this->getMockBuilder('\OC\Files\FileInfo')
+		$folderInfo = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()->getMock();
 
 		$baseTime = 1000;
@@ -847,7 +847,7 @@ class FolderTest extends NodeTest {
 			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
 			->getMock();
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\FileInfo $folderInfo */
-		$folderInfo = $this->getMockBuilder('\OC\Files\FileInfo')
+		$folderInfo = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()->getMock();
 
 		$baseTime = 1000;
@@ -906,7 +906,7 @@ class FolderTest extends NodeTest {
 			->setConstructorArgs([$manager, $view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
 			->getMock();
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Files\FileInfo $folderInfo */
-		$folderInfo = $this->getMockBuilder('\OC\Files\FileInfo')
+		$folderInfo = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()->getMock();
 
 		$baseTime = 1000;
diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php
index 160787411f18069be104d19a9593a243b6d008ca..9200ae69f7500fd9ed2b42f5ee5131e0482520d7 100644
--- a/tests/lib/Files/Node/NodeTest.php
+++ b/tests/lib/Files/Node/NodeTest.php
@@ -9,6 +9,7 @@
 namespace Test\Files\Node;
 
 use OC\Files\FileInfo;
+use OC\Files\Mount\Manager;
 use OC\Files\View;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\IRootFolder;
@@ -52,7 +53,7 @@ abstract class NodeTest extends \Test\TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->user = new \OC\User\User('', new \Test\Util\User\Dummy, null, $config, $urlGenerator);
-		$this->manager = $this->getMockBuilder('\OC\Files\Mount\Manager')
+		$this->manager = $this->getMockBuilder(Manager::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->view = $this->getMockBuilder(View::class)
diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php
index 2f81a96d48649f3525aae00d136cd244e78c92b0..fd050c8d90ccb7fd066d2157696d27000b6eb0f8 100644
--- a/tests/lib/Files/Node/RootTest.php
+++ b/tests/lib/Files/Node/RootTest.php
@@ -47,7 +47,7 @@ class RootTest extends \Test\TestCase {
 			->getMock();
 
 		$this->user = new \OC\User\User('', new \Test\Util\User\Dummy, null, $config, $urlgenerator);
-		$this->manager = $this->getMockBuilder('\OC\Files\Mount\Manager')
+		$this->manager = $this->getMockBuilder(Manager::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$this->userMountCache = $this->getMockBuilder('\OCP\Files\Config\IUserMountCache')
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index cab8bd62739c464135b09825de99417dd8ca7259..33d5cc0a8a66582029e647f411391579c7ba318a 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -2350,7 +2350,7 @@ class ViewTest extends \Test\TestCase {
 			return;
 		}
 
-		$eventHandler = $this->getMockBuilder('\stdclass')
+		$eventHandler = $this->getMockBuilder(\stdclass::class)
 			->setMethods(['preCallback', 'postCallback'])
 			->getMock();
 
@@ -2425,7 +2425,7 @@ class ViewTest extends \Test\TestCase {
 		Filesystem::getMountManager()->addMount($mount);
 
 		// Listen for events
-		$eventHandler = $this->getMockBuilder('\stdclass')
+		$eventHandler = $this->getMockBuilder(\stdclass::class)
 			->setMethods(['umount', 'post_umount'])
 			->getMock();
 		$eventHandler->expects($this->once())