diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 8a49401a07..fc48282384 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -20,8 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-
 class Test_Mount_Config_Dummy_Storage {
 	public function test() {
 		return true;
@@ -60,7 +58,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 
 		\OC_User::setUserId(self::TEST_USER1);
 		$this->userHome = \OC_User::getHome(self::TEST_USER1);
-		mkdir($this->userHome);
+		@mkdir($this->userHome);
 
 		$this->dataDir = \OC_Config::getValue(
 			'datadirectory',
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 99374d68a5..8dd7784d43 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,6 +10,10 @@ if ($configDir) {
 
 require_once __DIR__ . '/../lib/base.php';
 
+// load minimum set of apps
+OC_App::loadApps(array('authentication'));
+OC_App::loadApps(array('filesystem', 'logging'));
+
 if (!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
 }
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 5e5cc6ac12..27b9b8dd4f 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -49,7 +49,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$storage->file_put_contents('foo.txt', 'qwerty');
 		$storage->file_put_contents('folder/bar.txt', 'qwerty');
 
-		$scanner = new TestScanner('');
+		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection());
 		$scanner->addMount($mount);
 
 		$scanner->scan('');
@@ -71,7 +71,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$storage->file_put_contents('foo.txt', 'qwerty');
 		$storage->file_put_contents('folder/bar.txt', 'qwerty');
 
-		$scanner = new TestScanner('');
+		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection());
 		$scanner->addMount($mount);
 
 		$scanner->scan('');
@@ -98,7 +98,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$storage->file_put_contents('foo.txt', 'qwerty');
 		$storage->file_put_contents('folder/bar.txt', 'qwerty');
 
-		$scanner = new TestScanner('');
+		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection());
 		$originalPropagator = $scanner->getPropagator();
 		$scanner->setPropagator($propagator);
 		$scanner->addMount($mount);