6 files changed, 18 insertions, 9 deletions
diff --git a/tests/Unit/Db/FeedTest.php b/tests/Unit/Db/FeedTest.php
index 2e0d5535d..9b0c96f86 100644
--- a/tests/Unit/Db/FeedTest.php
+++ b/tests/Unit/Db/FeedTest.php
@@ -11,9 +11,11 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Db;
+namespace OCA\News\Tests\Unit\Db;
 
 
+use OCA\News\Db\Feed;
+
 class FeedTest extends \PHPUnit_Framework_TestCase {
 
 
diff --git a/tests/Unit/Db/FolderMapperTest.php b/tests/Unit/Db/FolderMapperTest.php
index 2d5ed0f13..87b276d7c 100644
--- a/tests/Unit/Db/FolderMapperTest.php
+++ b/tests/Unit/Db/FolderMapperTest.php
@@ -11,18 +11,21 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Db;
-
+namespace OCA\News\Tests\Unit\Db;
 
+use OCA\News\Db\Folder;
+use OCA\News\Db\FolderMapper;
 use OCA\News\Utility\Time;
 
-class FolderMapperTest extends \OCA\News\Tests\Unit\Db\MapperTestUtility {
+class FolderMapperTest extends MapperTestUtility
+{
 
     private $folderMapper;
     private $folders;
     private $user;
 
-    protected function setUp(){
+    protected function setUp()
+    {
         parent::setUp();
 
         $this->folderMapper = new FolderMapper($this->db, new Time());
diff --git a/tests/Unit/Db/FolderTest.php b/tests/Unit/Db/FolderTest.php
index 8be6e4302..39352425e 100644
--- a/tests/Unit/Db/FolderTest.php
+++ b/tests/Unit/Db/FolderTest.php
@@ -11,8 +11,9 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Db;
+namespace OCA\News\Tests\Unit\Db;
 
+use OCA\News\Db\Folder;
 
 class FolderTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/Unit/Db/ItemTest.php b/tests/Unit/Db/ItemTest.php
index 6f0b48e5a..cceca4b8b 100644
--- a/tests/Unit/Db/ItemTest.php
+++ b/tests/Unit/Db/ItemTest.php
@@ -11,8 +11,10 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Db;
+namespace OCA\News\Tests\Unit\Db;
 
+use OCA\News\Db\Feed;
+use OCA\News\Db\Item;
 
 class ItemTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/Unit/Db/MapperFactoryTest.php b/tests/Unit/Db/MapperFactoryTest.php
index d519b1105..f7c1ffa08 100644
--- a/tests/Unit/Db/MapperFactoryTest.php
+++ b/tests/Unit/Db/MapperFactoryTest.php
@@ -11,8 +11,10 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Db;
+namespace OCA\News\Tests\Unit\Db;
 
+use OCA\News\Db\ItemMapper;
+use OCA\News\Db\MapperFactory;
 use OCA\News\Utility\Time;
 use PHPUnit_Framework_TestCase;
 
diff --git a/tests/Unit/Db/MapperTestUtility.php b/tests/Unit/Db/MapperTestUtility.php
index 474def163..2448d8ddc 100644
--- a/tests/Unit/Db/MapperTestUtility.php
+++ b/tests/Unit/Db/MapperTestUtility.php
@@ -24,7 +24,6 @@
 
 namespace OCA\News\Tests\Unit\Db;
 
-
 /**
  * Simple utility class for testing mappers
  */