diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php
index 245deff3b318d7fcb806bc49845e07a255ab9b6c..29454c38218a51d2d503ff702dbc932da4dd07ee 100644
--- a/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php
+++ b/apps/dav/tests/unit/connector/sabre/requesttest/downloadtest.php
@@ -11,6 +11,13 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest;
 use OCP\AppFramework\Http;
 use OCP\Lock\ILockingProvider;
 
+/**
+ * Class DownloadTest
+ *
+ * @group DB
+ *
+ * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
+ */
 class DownloadTest extends RequestTest {
 	public function testDownload() {
 		$user = $this->getUniqueID();
diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php
index ed1d6046d757445bc92b82edd8b92dd886cb2251..b79dfa0c2659fae1a8aa2860a7c19f618d3ac4eb 100644
--- a/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php
+++ b/apps/dav/tests/unit/connector/sabre/requesttest/encryptionuploadtest.php
@@ -11,6 +11,13 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest;
 use OC\Files\View;
 use Test\Traits\EncryptionTrait;
 
+/**
+ * Class EncryptionUploadTest
+ *
+ * @group DB
+ *
+ * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
+ */
 class EncryptionUploadTest extends UploadTest {
 	use EncryptionTrait;
 
diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php b/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php
index a2a8326f4ff9f1712b6ea20a3fb3fe487942e9b4..c1876a7f29f202cdee387b253d6e9c1599728a6c 100644
--- a/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php
+++ b/apps/dav/tests/unit/connector/sabre/requesttest/uploadtest.php
@@ -12,6 +12,13 @@ use OC\Connector\Sabre\Exception\FileLocked;
 use OCP\AppFramework\Http;
 use OCP\Lock\ILockingProvider;
 
+/**
+ * Class UploadTest
+ *
+ * @group DB
+ *
+ * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
+ */
 class UploadTest extends RequestTest {
 	public function testBasicUpload() {
 		$user = $this->getUniqueID();
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index db5eb75d7610c236d3c0c80843067b4a4a4161b8..ccef4263c2b029293e4a016b45a7a797dc07c22a 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -38,6 +38,8 @@ use OCP\Share;
 use OC\URLGenerator;
 
 /**
+ * @group DB
+ *
  * @package OCA\Files_Sharing\Controllers
  */
 class ShareControllerTest extends \Test\TestCase {
diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php
index a549e093dc1110da5c4877b489ef2a063f3dbe4b..109545119bac6fb3d0b8edf47112c3841e63f891 100644
--- a/apps/files_sharing/tests/externalstorage.php
+++ b/apps/files_sharing/tests/externalstorage.php
@@ -24,6 +24,8 @@
 
 /**
  * Tests for the external Storage class for remote shares.
+ *
+ * @group DB
  */
 class Test_Files_Sharing_External_Storage extends \Test\TestCase {
 
diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/command/cleanuptest.php
index e928f55eb8b0c5330735e0645e2b65eb0b4b9af5..82084a2d525faf63679b3057bedd06d23d9121b4 100644
--- a/apps/files_trashbin/tests/command/cleanuptest.php
+++ b/apps/files_trashbin/tests/command/cleanuptest.php
@@ -29,6 +29,13 @@ use Test\TestCase;
 use OC\User\Manager;
 use OCP\Files\IRootFolder;
 
+/**
+ * Class CleanUpTest
+ *
+ * @group DB
+ *
+ * @package OCA\Files_Trashbin\Tests\Command
+ */
 class CleanUpTest extends TestCase {
 
 	/** @var  CleanUp */
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php
index 44b680f265c8bc6cadcd2ad2603f5d44005a8a2d..3ebbbc3ec9db487546e281bf1592c1d8cd2a6300 100644
--- a/apps/files_trashbin/tests/storage.php
+++ b/apps/files_trashbin/tests/storage.php
@@ -27,6 +27,13 @@ namespace OCA\Files_trashbin\Tests\Storage;
 use OC\Files\Storage\Temporary;
 use OC\Files\Filesystem;
 
+/**
+ * Class Storage
+ *
+ * @group DB
+ *
+ * @package OCA\Files_trashbin\Tests\Storage
+ */
 class Storage extends \Test\TestCase {
 	/**
 	 * @var string
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 934f831ef7473785b09cf3ee41f2080a26052d74..1b5e955d2b2172d5cc7e11b710c15e7b7435f31f 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -29,6 +29,8 @@ use OCA\Files_Trashbin;
 
 /**
  * Class Test_Encryption
+ *
+ * @group DB
  */
 class Test_Trashbin extends \Test\TestCase {
 
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 6ebbf830e70e8d1731746d12eb533c6ec2432a2f..ffc98c2e98ce6e915076049dc896653d101c5441 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -34,6 +34,8 @@ use OC\Files\Storage\Temporary;
 /**
  * Class Test_Files_versions
  * this class provide basic files versions test
+ *
+ * @group DB
  */
 class Test_Files_Versioning extends \Test\TestCase {
 
diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php
index 2e1a86025c287489de63920551e74e8cd9b58497..4ccba704a3a777fdd25f56fc2fa6b30ca0454c1b 100644
--- a/apps/provisioning_api/tests/appstest.php
+++ b/apps/provisioning_api/tests/appstest.php
@@ -23,15 +23,35 @@
  */
 
 namespace OCA\Provisioning_API\Tests;
+use OCA\Provisioning_API\Apps;
+use OCP\API;
+use OCP\App\IAppManager;
+use OCP\IUserSession;
 
+/**
+ * Class AppsTest
+ *
+ * @group DB
+ *
+ * @package OCA\Provisioning_API\Tests
+ */
 class AppsTest extends TestCase {
-	
+
+	/** @var IAppManager */
+	private $appManager;
+
+	/** @var Apps */
+	private $api;
+
+	/** @var IUserSession */
+	private $userSession;
+
 	public function setup() {
 		parent::setup();
 		$this->appManager = \OC::$server->getAppManager();
 		$this->groupManager = \OC::$server->getGroupManager();
 		$this->userSession = \OC::$server->getUserSession();
-		$this->api = new \OCA\Provisioning_API\Apps($this->appManager);
+		$this->api = new Apps($this->appManager);
 	}
 
 	public function testGetAppInfo() {
@@ -46,7 +66,7 @@ class AppsTest extends TestCase {
 		$result = $this->api->getAppInfo(['appid' => 'not_provisioning_api']);
 		$this->assertInstanceOf('OC_OCS_Result', $result);
 		$this->assertFalse($result->succeeded());
-		$this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode());
+		$this->assertEquals(API::RESPOND_NOT_FOUND, $result->getStatusCode());
 
 	}
 
diff --git a/apps/provisioning_api/tests/testcase.php b/apps/provisioning_api/tests/testcase.php
index 113bc512243cc3b1d24050a79eef37bf4a310b69..0cbe0d89f8653104011a5afbab1f918dffa3cdba 100644
--- a/apps/provisioning_api/tests/testcase.php
+++ b/apps/provisioning_api/tests/testcase.php
@@ -23,10 +23,13 @@
 
 namespace OCA\Provisioning_API\Tests;
 
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IGroupManager;
 
 abstract class TestCase extends \Test\TestCase {
+
+	/** @var IUser[] */
 	protected $users = array();
 
 	/** @var IUserManager */
@@ -46,7 +49,7 @@ abstract class TestCase extends \Test\TestCase {
 	/**
 	 * Generates a temp user
 	 * @param int $num number of users to generate
-	 * @return IUser[]|Iuser
+	 * @return IUser[]|IUser
 	 */
 	protected function generateUsers($num = 1) {
 		$users = array();
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index 948a432d2ed53e32630a27a96115c48c483e3a05..efe41763ff7d0ba6008517f5ef3b4bec74ed9dd1 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/avatar/avatarcontrollertest.php
@@ -44,6 +44,8 @@ function is_uploaded_file($filename) {
 /**
  * Class AvatarControllerTest
  *
+ * @group DB
+ *
  * @package OC\Core\Avatar
  */
 class AvatarControllerTest extends \Test\TestCase {
diff --git a/tests/lib/encryption/decryptalltest.php b/tests/lib/encryption/decryptalltest.php
index ce5bcf1e5ae36173a62822dd763424ff63848581..85fbe3e0ed95408df016df4bc34e1b6c4af2f4b0 100644
--- a/tests/lib/encryption/decryptalltest.php
+++ b/tests/lib/encryption/decryptalltest.php
@@ -30,6 +30,13 @@ use OC\Files\View;
 use OCP\IUserManager;
 use Test\TestCase;
 
+/**
+ * Class DecryptAllTest
+ *
+ * @group DB
+ *
+ * @package Test\Encryption
+ */
 class DecryptAllTest extends TestCase {
 
 	/** @var \PHPUnit_Framework_MockObject_MockObject | IUserManager */
diff --git a/tests/lib/files/cache/wrapper/cachejail.php b/tests/lib/files/cache/wrapper/cachejail.php
index 13f3dc8858ef7c6ab5b9aea1e395e92afe74a033..9ddf3e9c61c4c7d6378ce64574ee6855be3bdbbb 100644
--- a/tests/lib/files/cache/wrapper/cachejail.php
+++ b/tests/lib/files/cache/wrapper/cachejail.php
@@ -10,6 +10,13 @@ namespace Test\Files\Cache\Wrapper;
 
 use Test\Files\Cache\Cache;
 
+/**
+ * Class CacheJail
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache\Wrapper
+ */
 class CacheJail extends Cache {
 	/**
 	 * @var \OC\Files\Cache\Cache $sourceCache
diff --git a/tests/lib/files/cache/wrapper/cachepermissionsmask.php b/tests/lib/files/cache/wrapper/cachepermissionsmask.php
index 72fd22741d3f93073b2040caceed952a69bd5bf0..a4cc7edba3718b4f48b138714288beae72ab454b 100644
--- a/tests/lib/files/cache/wrapper/cachepermissionsmask.php
+++ b/tests/lib/files/cache/wrapper/cachepermissionsmask.php
@@ -11,6 +11,13 @@ namespace Test\Files\Cache\Wrapper;
 use OCP\Constants;
 use Test\Files\Cache\Cache;
 
+/**
+ * Class CachePermissionsMask
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache\Wrapper
+ */
 class CachePermissionsMask extends Cache {
 	/**
 	 * @var \OC\Files\Cache\Cache $sourceCache
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 8c98256575e26d12683e6451f867e70485795051..2c9339bb6dce724e51a31d4c38af5371ea1614e3 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -16,6 +16,13 @@ use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OC\Files\View;
 
+/**
+ * Class Folder
+ *
+ * @group DB
+ *
+ * @package Test\Files\Node
+ */
 class Folder extends \Test\TestCase {
 	private $user;
 
diff --git a/tests/lib/files/node/hookconnector.php b/tests/lib/files/node/hookconnector.php
index 10566cf5fb1fd8e98ee291f3ea83534b68efc07b..646e3952a385f35612a4a041a221be87a730e120 100644
--- a/tests/lib/files/node/hookconnector.php
+++ b/tests/lib/files/node/hookconnector.php
@@ -17,6 +17,13 @@ use Test\TestCase;
 use Test\Traits\MountProviderTrait;
 use Test\Traits\UserTrait;
 
+/**
+ * Class HookConnector
+ *
+ * @group DB
+ * 
+ * @package Test\Files\Node
+ */
 class HookConnector extends TestCase {
 	use UserTrait;
 	use MountProviderTrait;
diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php
index 2b70dc8713eb7361a1796f0e7062d25903d8e16f..bbe6f2a73e2ba75e6ec1556fcb653fbe739f5da2 100644
--- a/tests/lib/files/storage/commontest.php
+++ b/tests/lib/files/storage/commontest.php
@@ -22,6 +22,13 @@
 
 namespace Test\Files\Storage;
 
+/**
+ * Class CommonTest
+ *
+ * @group DB
+ *
+ * @package Test\Files\Storage
+ */
 class CommonTest extends Storage {
 	/**
 	 * @var string tmpDir
diff --git a/tests/lib/files/storage/copydirectory.php b/tests/lib/files/storage/copydirectory.php
index 3338747f49b0c4744a4831edd38ee3ff42c348e9..bc066268cda69ad0309733b38af87adb742f44fd 100644
--- a/tests/lib/files/storage/copydirectory.php
+++ b/tests/lib/files/storage/copydirectory.php
@@ -36,6 +36,13 @@ class CopyDirectoryStorage extends StorageNoRecursiveCopy {
 	use \OC\Files\Storage\PolyFill\CopyDirectory;
 }
 
+/**
+ * Class CopyDirectory
+ *
+ * @group DB
+ *
+ * @package Test\Files\Storage
+ */
 class CopyDirectory extends Storage {
 
 	protected function setUp() {
diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php
index b0670a22892a33b819be374aaf42afaad63a11e0..a51912ca1b2fee8261aef5210095897ce180ca48 100644
--- a/tests/lib/files/storage/home.php
+++ b/tests/lib/files/storage/home.php
@@ -47,6 +47,13 @@ class DummyUser extends User {
 	}
 }
 
+/**
+ * Class Home
+ *
+ * @group DB
+ *
+ * @package Test\Files\Storage
+ */
 class Home extends Storage {
 	/**
 	 * @var string tmpDir
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index d2b27117c3b62cdbfbf9c31e0dd2ea0b2ae3f39a..36267dc66057d81aaaace09817a86076422927d6 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -22,6 +22,13 @@
 
 namespace Test\Files\Storage;
 
+/**
+ * Class Local
+ *
+ * @group DB
+ *
+ * @package Test\Files\Storage
+ */
 class Local extends Storage {
 	/**
 	 * @var string tmpDir
diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php
index 441f3a39d3262784a5a216af5bda1bc958409755..b0a06b0d898dee9f2a266cbdd099cedf76a2c8db 100644
--- a/tests/lib/files/storage/wrapper/quota.php
+++ b/tests/lib/files/storage/wrapper/quota.php
@@ -11,6 +11,13 @@ namespace Test\Files\Storage\Wrapper;
 //ensure the constants are loaded
 \OC::$loader->load('\OC\Files\Filesystem');
 
+/**
+ * Class Quota
+ *
+ * @group DB
+ *
+ * @package Test\Files\Storage\Wrapper
+ */
 class Quota extends \Test\Files\Storage\Storage {
 	/**
 	 * @var string tmpDir
diff --git a/tests/lib/helperstorage.php b/tests/lib/helperstorage.php
index 8b5f41fc94cb5c19ced115495c834bc4d479ce3e..d41bc68a7b1f6655a304935c1f57e47b753116c4 100644
--- a/tests/lib/helperstorage.php
+++ b/tests/lib/helperstorage.php
@@ -8,8 +8,9 @@
 
 /**
  * Test the storage functions of OC_Helper
+ *
+ * @group DB
  */
-
 class Test_Helper_Storage extends \Test\TestCase {
 	/** @var string */
 	private $user;
diff --git a/tests/lib/log/owncloud.php b/tests/lib/log/owncloud.php
index d977583612b0208a07c3d67aab91082e71cf83f7..8cc6aa9d57a97b49bf237fe90035505fad2d091e 100644
--- a/tests/lib/log/owncloud.php
+++ b/tests/lib/log/owncloud.php
@@ -15,6 +15,11 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Class Test_Log_Owncloud
+ *
+ * @group DB
+ */
 class Test_Log_Owncloud extends Test\TestCase
 {
 	private $restore_logfile;
@@ -22,8 +27,8 @@ class Test_Log_Owncloud extends Test\TestCase
 
 	protected function setUp() {
 		parent::setUp();
-		$restore_logfile = OC_Config::getValue("logfile");
-		$restore_logdateformat = OC_Config::getValue('logdateformat');
+		$this->restore_logfile = OC_Config::getValue("logfile");
+		$this->restore_logdateformat = OC_Config::getValue('logdateformat');
 		
 		OC_Config::setValue("logfile", OC_Config::getValue('datadirectory') . "/logtest");
 		OC_Log_Owncloud::init();
diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/privatedata.php
index a9300f5beac15730c10ecae04ca667c04d051010..ce153bf07d6025eaa5258f897acfff222420580b 100644
--- a/tests/lib/ocs/privatedata.php
+++ b/tests/lib/ocs/privatedata.php
@@ -20,6 +20,11 @@
  *
  */
 
+/**
+ * Class Test_OC_OCS_Privatedata
+ *
+ * @group DB
+ */
 class Test_OC_OCS_Privatedata extends \Test\TestCase {
 	private $appKey;
 
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index e4c599c66cf21d410145af66c01ee8b5aa6cd532..bc6f849cbe8333b122583fcde998fdc21d176a07 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -28,6 +28,13 @@ use OC\Files\View;
 use Test\Traits\MountProviderTrait;
 use Test\Traits\UserTrait;
 
+/**
+ * Class Preview
+ *
+ * @group DB
+ *
+ * @package Test
+ */
 class Preview extends TestCase {
 	use UserTrait;
 	use MountProviderTrait;
diff --git a/tests/lib/preview/bitmap.php b/tests/lib/preview/bitmap.php
index 49112852e29e166c560b845715ffce589435bc22..1e135ceb08317673ef47a5c2a4bb1ea5f4b64d61 100644
--- a/tests/lib/preview/bitmap.php
+++ b/tests/lib/preview/bitmap.php
@@ -21,6 +21,13 @@
 
 namespace Test\Preview;
 
+/**
+ * Class Bitmap
+ *
+ * @group DB
+ *
+ * @package Test\Preview
+ */
 class Bitmap extends Provider {
 
 	public function setUp() {
diff --git a/tests/lib/preview/image.php b/tests/lib/preview/image.php
index af46f4e4a6689b7b79b0af15c328aab694248750..6c82ff85723cd0700996ab33ab30aa89b9bf0308 100644
--- a/tests/lib/preview/image.php
+++ b/tests/lib/preview/image.php
@@ -21,6 +21,13 @@
 
 namespace Test\Preview;
 
+/**
+ * Class Image
+ *
+ * @group DB
+ *
+ * @package Test\Preview
+ */
 class Image extends Provider {
 
 	public function setUp() {
diff --git a/tests/lib/preview/mp3.php b/tests/lib/preview/mp3.php
index ac3ab07a2bd5446e3607862faf64b2a2783a6c45..f6875a88ebde3eb18a12ebc0c576fcae7a3e5e97 100644
--- a/tests/lib/preview/mp3.php
+++ b/tests/lib/preview/mp3.php
@@ -21,6 +21,13 @@
 
 namespace Test\Preview;
 
+/**
+ * Class MP3
+ *
+ * @group DB
+ *
+ * @package Test\Preview
+ */
 class MP3 extends Provider {
 
 	public function setUp() {
diff --git a/tests/lib/preview/svg.php b/tests/lib/preview/svg.php
index 768569c72edff2de409bb71e431feefb6fec1405..ef5f4cff80fb8a94eed64cd248cdef39b38057e4 100644
--- a/tests/lib/preview/svg.php
+++ b/tests/lib/preview/svg.php
@@ -21,6 +21,13 @@
 
 namespace Test\Preview;
 
+/**
+ * Class SVG
+ *
+ * @group DB
+ *
+ * @package Test\Preview
+ */
 class SVG extends Provider {
 
 	public function setUp() {
diff --git a/tests/lib/preview/txt.php b/tests/lib/preview/txt.php
index 8bda86f25e3279af6963f6746cc426b2c7f55c5c..219b850be95401fd80558a89d1792ffc522cbac7 100644
--- a/tests/lib/preview/txt.php
+++ b/tests/lib/preview/txt.php
@@ -21,6 +21,13 @@
 
 namespace Test\Preview;
 
+/**
+ * Class TXT
+ *
+ * @group DB
+ *
+ * @package Test\Preview
+ */
 class TXT extends Provider {
 
 	public function setUp() {
diff --git a/tests/lib/server.php b/tests/lib/server.php
index 96a476bd4d1a2d8794f03b0af20edef336c72699..b72bef820366011f48a7b10e2d246c5eab178d31 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -24,6 +24,13 @@
 
 namespace Test;
 
+/**
+ * Class Server
+ *
+ * @group DB
+ *
+ * @package Test
+ */
 class Server extends \Test\TestCase {
 	/** @var \OC\Server */
 	protected $server;
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 6216c5a4be89023598a2fbe21fbc0166591771b6..9b0975352807b10a4d7904b144b0f7edcfcbd7b1 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -20,6 +20,11 @@
  *
  */
 
+/**
+ * Class Test_StreamWrappers
+ *
+ * @group DB
+ */
 class Test_StreamWrappers extends \Test\TestCase {
 
 	private static $trashBinStatus;