diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php
index dcc6d57793..52597f9bca 100644
--- a/phpBB/phpbb/storage/adapter/local.php
+++ b/phpBB/phpbb/storage/adapter/local.php
@@ -36,7 +36,7 @@ class local implements adapter_interface
 		$this->filesystem = $filesystem;
 		$this->root_path = $phpbb_root_path.$config[$path_key];
 
-		if(substr($this->root_path, -1, 1) != DIRECTORY_SEPARATOR)
+		if (substr($this->root_path, -1, 1) != DIRECTORY_SEPARATOR)
 		{
 			$this->root_path = $this->root_path.DIRECTORY_SEPARATOR;
 		}
diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php
index dc52004b3a..1f5e751bbb 100644
--- a/phpBB/phpbb/storage/storage.php
+++ b/phpBB/phpbb/storage/storage.php
@@ -13,8 +13,6 @@
 
 namespace phpbb\storage;
 
-use phpbb\storage\exception\exception;
-
 class storage
 {
 	protected $adapter;
diff --git a/tests/storage/adapter/local_test.php b/tests/storage/adapter/local_test.php
index ecc06cf688..0ae62a85a1 100644
--- a/tests/storage/adapter/local_test.php
+++ b/tests/storage/adapter/local_test.php
@@ -16,10 +16,17 @@
 	 protected $adapter;
 
 	public function setUp()
- 	{
- 		parent::setUp();
-		$this->adapter = new \phpbb\storage\adapter\local();
- 	}
+	{
+		parent::setUp();
+
+		$config = new \phpbb\config\config(array(
+			'test_path'	=> '.',
+		));
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$phpbb_root_path = getcwd().DIRECTORY_SEPARATOR;
+		$path_key = 'test_path';
+		$this->adapter = new \phpbb\storage\adapter\local($config, $filesystem, $phpbb_root_path, $path_key);
+	}
 
 	public function tearDown()
 	{
@@ -44,11 +51,11 @@
 	public function test_exists()
 	{
 		// Exists with files
-		$this->assertTrue($this->adapter->exists(__DIR__.'/local_test.php'));
-		$this->assertFalse($this->adapter->exists(__DIR__.'/nonexistent_file.php'));
+		$this->assertTrue($this->adapter->exists('README.md'));
+		$this->assertFalse($this->adapter->exists('nonexistent_file.php'));
 		// exists with directory
-		$this->assertTrue($this->adapter->exists(__DIR__.'/../adapter'));
-		$this->assertFalse($this->adapter->exists(__DIR__.'/../nonexistet_folder'));
+		$this->assertTrue($this->adapter->exists('phpBB'));
+		$this->assertFalse($this->adapter->exists('nonexistet_folder'));
 	}
 
 	public function test_delete()
@@ -83,4 +90,5 @@
 		unlink('file.txt');
 		unlink('file2.txt');
 	}
+
  }