diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
index 353520bd604..c9aea60d255 100644
--- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
+++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
@@ -154,7 +154,7 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
 	public function testKeepNonFileShares() {
 		$this->loginAsUser($this->user1);
 
-		\OCP\Share::registerBackend('test', 'Test_Share_Backend');
+		\OCP\Share::registerBackend('test', 'Test\Share\Backend');
 
 		$this->assertTrue(
 			\OCP\Share::shareItem('test', 'test.txt', \OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ),
diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php
index 1d047916ca9..1c8b5ed7a17 100644
--- a/apps/files_sharing/tests/server2server.php
+++ b/apps/files_sharing/tests/server2server.php
@@ -51,7 +51,7 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase {
 		parent::setUp();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
-		\OCP\Share::registerBackend('test', 'Test_Share_Backend');
+		\OCP\Share::registerBackend('test', 'Test\Share\Backend');
 
 		$config = $this->getMockBuilder('\OCP\IConfig')
 				->disableOriginalConstructor()->getMock();
diff --git a/tests/lib/TagsTest.php b/tests/lib/TagsTest.php
index 88e0f87ad8f..2662c209d2c 100644
--- a/tests/lib/TagsTest.php
+++ b/tests/lib/TagsTest.php
@@ -286,7 +286,7 @@ class TagsTest extends \Test\TestCase {
 
 	public function testShareTags() {
 		$testTag = 'TestTag';
-		\OCP\Share::registerBackend('test', 'Test_Share_Backend');
+		\OCP\Share::registerBackend('test', 'Test\Share\Backend');
 
 		$tagger = $this->tagMgr->load('test');
 		$tagger->tagAs(1, $testTag);
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index e8240fb6738..355005bb586 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -78,7 +78,7 @@ class Share extends \Test\TestCase {
 		\OC_Group::addToGroup($this->user4, $this->group2);
 		\OC_Group::addToGroup($this->user2, $this->groupAndUser);
 		\OC_Group::addToGroup($this->user3, $this->groupAndUser);
-		\OCP\Share::registerBackend('test', 'Test_Share_Backend');
+		\OCP\Share::registerBackend('test', 'Test\Share\Backend');
 		\OC_Hook::clear('OCP\\Share');
 		\OC::registerShareHooks();
 		$this->resharing = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_resharing', 'yes');
@@ -92,7 +92,7 @@ class Share extends \Test\TestCase {
 	}
 
 	protected function tearDown() {
-		$query = OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?');
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?');
 		$query->execute(array('test'));
 		\OC::$server->getAppConfig()->setValue('core', 'shareapi_allow_resharing', $this->resharing);