diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 54aa7ad789..3201e2d03f 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -8,7 +8,6 @@
 
 namespace Test\Files\Cache;
 
-use PHPUnit_Framework_MockObject_MockObject;
 
 class LongId extends \OC\Files\Storage\Temporary {
 	public function getId() {
@@ -491,7 +490,7 @@ class Cache extends \Test\TestCase {
 		$folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e";
 
 		/**
-		 * @var \OC\Files\Cache\Cache | PHPUnit_Framework_MockObject_MockObject $cacheMock
+		 * @var \OC\Files\Cache\Cache | \PHPUnit_Framework_MockObject_MockObject $cacheMock
 		 */
 		$cacheMock = $this->getMock('\OC\Files\Cache\Cache', array('normalize'), array($this->storage), '', true);
 
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/IntegrationTest.php
similarity index 98%
rename from tests/lib/files/node/integration.php
rename to tests/lib/files/node/IntegrationTest.php
index addc7e98f4..e11f9bca4e 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/IntegrationTest.php
@@ -20,7 +20,7 @@ use OC\User\User;
  *
  * @package Test\Files\Node
  */
-class IntegrationTests extends \Test\TestCase {
+class IntegrationTest extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Node\Root $root
 	 */
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/SwiftTest.php
similarity index 96%
rename from tests/lib/files/objectstore/swift.php
rename to tests/lib/files/objectstore/SwiftTest.php
index a63f584414..4731936627 100644
--- a/tests/lib/files/objectstore/swift.php
+++ b/tests/lib/files/objectstore/SwiftTest.php
@@ -18,22 +18,22 @@
  *
  */
 
-namespace OCA\ObjectStore\Tests\Unit;
+namespace Test\Files\Cache\ObjectStore;
 
 use OC\Files\ObjectStore\ObjectStoreStorage;
-use OC\Files\ObjectStore\Swift as ObjectStoreToTest;
+use OC\Files\ObjectStore\Swift;
 
 /**
- * Class Swift
+ * Class SwiftTest
  *
  * @group DB
  *
- * @package OCA\ObjectStore\Tests\Unit
+ * @package Test\Files\Cache\ObjectStore
  */
-class Swift extends \Test\Files\Storage\Storage {
+class SwiftTest extends \Test\Files\Storage\Storage {
 
 	/**
-	 * @var ObjectStoreToTest
+	 * @var Swift
 	 */
 	private $objectStorage;
 
@@ -63,7 +63,7 @@ class Swift extends \Test\Files\Storage\Storage {
 		\OC_User::setUserId('test');
 
 		$config = \OC::$server->getConfig()->getSystemValue('objectstore');
-		$this->objectStorage = new ObjectStoreToTest($config['arguments']);
+		$this->objectStorage = new Swift($config['arguments']);
 		$config['objectstore'] = $this->objectStorage;
 		$this->instance = new ObjectStoreStorage($config);
 	}
diff --git a/tests/lib/files/objectstore/noopscanner.php b/tests/lib/files/objectstore/noopscanner.php
index f860c03cb1..fba6619d42 100644
--- a/tests/lib/files/objectstore/noopscanner.php
+++ b/tests/lib/files/objectstore/noopscanner.php
@@ -9,7 +9,7 @@
  * later.
  * See the COPYING-README file.
  */
-namespace Test\Files\Cache;
+namespace Test\Files\Cache\ObjectStore;
 
 class NoopScanner extends \Test\TestCase {
 	/** @var \OC\Files\Storage\Storage $storage */
diff --git a/tests/lib/files/pathverificationtest.php b/tests/lib/files/pathverificationtest.php
index db393ce5e5..ea9859c862 100644
--- a/tests/lib/files/pathverificationtest.php
+++ b/tests/lib/files/pathverificationtest.php
@@ -17,7 +17,7 @@ use OC\Files\View;
  *
  * @package Test\Files
  */
-class PathVerification extends \Test\TestCase {
+class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @var \OC\Files\View
diff --git a/tests/lib/files/storage/wrapper/availability.php b/tests/lib/files/storage/wrapper/availability.php
index 99d6f7dbe5..311334a80a 100644
--- a/tests/lib/files/storage/wrapper/availability.php
+++ b/tests/lib/files/storage/wrapper/availability.php
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace Test\Files\Storage\Wrapper;
 
 class Availability extends \Test\TestCase {
diff --git a/tests/lib/files/type/detection.php b/tests/lib/files/type/DetectionTest.php
similarity index 100%
rename from tests/lib/files/type/detection.php
rename to tests/lib/files/type/DetectionTest.php
diff --git a/tests/lib/files/type/loadertest.php b/tests/lib/files/type/loadertest.php
index 7f87afd2f4..a77d672f66 100644
--- a/tests/lib/files/type/loadertest.php
+++ b/tests/lib/files/type/loadertest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OC\Files\Type;
+namespace Test\Files\Type;
 
 use \OC\Files\Type\Loader;
 use \OCP\IDBConnection;