diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 04e14c335bd7ebb6b022af60de0384b12b287c10..8faf804a2031cad6544c75204b8c3fdaee8fa1b2 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -50,7 +50,10 @@ class TempManager extends \Test\TestCase {
 			$logger = new NullLogger();
 		}
 		if (!$config) {
-			$config = \OC::$server->getConfig();
+			$config = $this->getMock('\OCP\IConfig');
+			$config->method('getSystemValue')
+				->with('tempdirectory', null)
+				->willReturn('/tmp');
 		}
 		$manager = new \OC\TempManager($logger, $config);
 		if ($this->baseDir) {
@@ -195,4 +198,19 @@ class TempManager extends \Test\TestCase {
 		$this->assertStringEndsNotWith('./Traversal\\../FileName', $tmpManager);
 		$this->assertStringEndsWith('.Traversal..FileName', $tmpManager);
 	}
+
+	public function testGetTempBaseDirFromConfig() {
+		$dir = $this->getManager()->getTemporaryFolder();
+
+		$config = $this->getMock('\OCP\IConfig');
+		$config->expects($this->once())
+			->method('getSystemValue')
+			->with('tempdirectory', null)
+			->willReturn($dir);
+
+		$this->baseDir = null; // prevent override
+		$tmpManager = $this->getManager(null, $config);
+
+		$this->assertEquals($dir, $tmpManager->getTempBaseDir());
+	}
 }