diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php
index 744d460842..ce53c884f3 100644
--- a/tests/lib/files/storage/commontest.php
+++ b/tests/lib/files/storage/commontest.php
@@ -28,10 +28,7 @@ class CommonTest extends Storage {
 	 */
 	private $tmpDir;
 	public function setUp() {
-		$this->tmpDir=get_temp_dir().'/filestoragecommon';
-		if(!file_exists($this->tmpDir)) {
-			mkdir($this->tmpDir);
-		}
+		$this->tmpDir=\OC_Helper::tmpFolder();
 		$this->instance=new \OC\Files\Storage\CommonTest(array('datadir'=>$this->tmpDir));
 	}