diff --git a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php
index 246fe816e54..a20c66a39bd 100644
--- a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php
+++ b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php
@@ -129,17 +129,20 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
 	public function testClearShares() {
 		$this->loginAsUser($this->user1);
 
-		$view = new \OC\Files\View('/' . $this->user1 . '/');
-		$view->mkdir('files/test');
-		$view->mkdir('files/test/sub');
+		$user1Folder = \OC::$server->getUserFolder($this->user1);
+		$testFolder = $user1Folder->newFolder('test');
+		$testSubFolder = $testFolder->newFolder('sub');
 
-		$fileInfo = $view->getFileInfo('files/test/sub');
-		$fileId = $fileInfo->getId();
+		$shareManager = \OC::$server->getShareManager();
+		$share = $shareManager->newShare();
 
-		$this->assertTrue(
-			\OC\Share\Share::shareItem('folder', $fileId, \OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ),
-			'Failed asserting that user 1 successfully shared "test/sub" with user 2.'
-		);
+		$share->setNode($testSubFolder)
+			->setShareType(\OCP\Share::SHARE_TYPE_USER)
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setSharedWith($this->user2)
+			->setSharedBy($this->user1);
+
+		$shareManager->createShare($share);
 
 		$this->assertCount(1, $this->getShares());
 
@@ -147,28 +150,11 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
 
 		$this->assertCount(1, $this->getShares(), 'Linked shares not deleted');
 
-		$view->unlink('files/test');
+		$testFolder->delete();
 
 		$this->job->run([]);
 
 		$this->assertCount(0, $this->getShares(), 'Orphaned shares deleted');
 	}
-
-	public function testKeepNonFileShares() {
-		$this->loginAsUser($this->user1);
-
-		\OC\Share\Share::registerBackend('test', 'Test\Share\Backend');
-
-		$this->assertTrue(
-			\OC\Share\Share::shareItem('test', 'test.txt', \OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ),
-			'Failed asserting that user 1 successfully shared something with user 2.'
-		);
-
-		$this->assertCount(1, $this->getShares());
-
-		$this->job->run([]);
-
-		$this->assertCount(1, $this->getShares(), 'Non-file shares kept');
-	}
 }
 
diff --git a/apps/files_sharing/tests/ExpireSharesJobTest.php b/apps/files_sharing/tests/ExpireSharesJobTest.php
index 46b50c5fac4..84449048ef3 100644
--- a/apps/files_sharing/tests/ExpireSharesJobTest.php
+++ b/apps/files_sharing/tests/ExpireSharesJobTest.php
@@ -133,15 +133,18 @@ class ExpireSharesJobTest extends \Test\TestCase {
 	public function testExpireLinkShare($addExpiration, $interval, $addInterval, $shouldExpire) {
 		$this->loginAsUser($this->user1);
 
-		$view = new \OC\Files\View('/' . $this->user1 . '/');
-		$view->mkdir('files/test');
+		$user1Folder = \OC::$server->getUserFolder($this->user1);
+		$testFolder = $user1Folder->newFolder('test');
 
-		$fileInfo = $view->getFileInfo('files/test');
+		$shareManager = \OC::$server->getShareManager();
+		$share = $shareManager->newShare();
 
-		$this->assertNotNull(
-			\OC\Share\Share::shareItem('folder', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ),
-			'Failed asserting that user 1 successfully shared "test" by link.'
-		);
+		$share->setNode($testFolder)
+			->setShareType(\OCP\Share::SHARE_TYPE_LINK)
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setSharedBy($this->user1);
+
+		$shareManager->createShare($share);
 
 		$shares = $this->getShares();
 		$this->assertCount(1, $shares);
@@ -187,20 +190,22 @@ class ExpireSharesJobTest extends \Test\TestCase {
 	public function testDoNotExpireOtherShares() {
 		$this->loginAsUser($this->user1);
 
-		$view = new \OC\Files\View('/' . $this->user1 . '/');
-		$view->mkdir('files/test');
+		$user1Folder = \OC::$server->getUserFolder($this->user1);
+		$testFolder = $user1Folder->newFolder('test');
 
-		$fileInfo = $view->getFileInfo('files/test');
+		$shareManager = \OC::$server->getShareManager();
+		$share = $shareManager->newShare();
 
-		$this->assertNotNull(
-			\OC\Share\Share::shareItem('folder', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ),
-			'Failed asserting that user 1 successfully shared "test" by link with user2.'
-		);
+		$share->setNode($testFolder)
+			->setShareType(\OCP\Share::SHARE_TYPE_USER)
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setSharedBy($this->user1)
+			->setSharedWith($this->user2);
+
+		$shareManager->createShare($share);
 
 		$shares = $this->getShares();
 		$this->assertCount(1, $shares);
-		reset($shares);
-		$share = current($shares);
 
 		$this->logout();
 
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 627eb71d6bf..9b435f2b935 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -1666,7 +1666,17 @@ class ViewTest extends \Test\TestCase {
 
 		$fileId = $view->getFileInfo('shareddir')->getId();
 		$userObject = \OC::$server->getUserManager()->createUser('test2', 'IHateNonMockableStaticClasses');
-		$this->assertTrue(\OC\Share\Share::shareItem('folder', $fileId, Share::SHARE_TYPE_USER, 'test2', Constants::PERMISSION_READ));
+
+		$userFolder = \OC::$server->getUserFolder($this->user);
+		$shareDir = $userFolder->get('shareddir');
+		$shareManager = \OC::$server->getShareManager();
+		$share = $shareManager->newShare();
+		$share->setSharedWith('test2')
+			->setSharedBy($this->user)
+			->setShareType(\OCP\Share::SHARE_TYPE_USER)
+			->setPermissions(\OCP\Constants::PERMISSION_READ)
+			->setNode($shareDir);
+		$shareManager->createShare($share);
 
 		$this->assertFalse($view->rename('mount1', 'shareddir'), 'Cannot overwrite shared folder');
 		$this->assertFalse($view->rename('mount1', 'shareddir/sub'), 'Cannot move mount point into shared folder');