diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 88acbd8e77..453133fee3 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -35,6 +35,9 @@ class Test_Files_Sharing_Api extends TestCase {
 	function setUp() {
 		parent::setUp();
 
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_expire_after_n_days', '7');
+
 		$this->folder = self::TEST_FOLDER_NAME;
 		$this->subfolder  = '/subfolder_share_api_test';
 		$this->subsubfolder = '/subsubfolder_share_api_test';
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index e991d381e1..6d155f174b 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -226,6 +226,10 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 }
 
 class DummyTestClassSharedMount extends \OCA\Files_Sharing\SharedMount {
+	public function __construct($storage, $mountpoint, $arguments = null, $loader = null){
+		// noop
+	}
+
 	public function stripUserFilesPathDummy($path) {
 		return $this->stripUserFilesPath($path);
 	}
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 70cd45a818..78277dc907 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -72,8 +72,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER3, self::TEST_FILES_SHARING_API_USER3);
 
 		// create group
-		\OC_Group::createGroup(self::TEST_FILES_SHARING_API_GROUP1);
-		\OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_GROUP1);
+		$groupBackend = new \OC_Group_Dummy();
+		$groupBackend->createGroup(self::TEST_FILES_SHARING_API_GROUP1);
+		$groupBackend->createGroup('group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER1, 'group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER2, 'group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER3, 'group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_GROUP1);
+		\OC_Group::useBackend($groupBackend);
 
 	}