diff --git a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php b/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php
index e1bcc99690..1a973a28ed 100644
--- a/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php
+++ b/apps/dav/tests/unit/connector/sabre/custompropertiesbackend.php
@@ -8,6 +8,14 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre;
  * later.
  * See the COPYING-README file.
  */
+
+/**
+ * Class CustomPropertiesBackend
+ *
+ * @group DB
+ *
+ * @package Tests\Connector\Sabre
+ */
 class CustomPropertiesBackend extends \Test\TestCase {
 
 	/**
diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/connector/sabre/file.php
index 0a52299cec..2a6cf46ef1 100644
--- a/apps/dav/tests/unit/connector/sabre/file.php
+++ b/apps/dav/tests/unit/connector/sabre/file.php
@@ -14,6 +14,13 @@ use Test\HookHelper;
 use OC\Files\Filesystem;
 use OCP\Lock\ILockingProvider;
 
+/**
+ * Class File
+ *
+ * @group DB
+ *
+ * @package Test\Connector\Sabre
+ */
 class File extends \Test\TestCase {
 
 	/**
diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/service/tagservice.php
index 147e698aaa..36da3edc61 100644
--- a/apps/files/tests/service/tagservice.php
+++ b/apps/files/tests/service/tagservice.php
@@ -22,6 +22,13 @@ namespace OCA\Files;
 
 use \OCA\Files\Service\TagService;
 
+/**
+ * Class TagServiceTest
+ *
+ * @group DB
+ *
+ * @package OCA\Files
+ */
 class TagServiceTest extends \Test\TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/activity.php b/apps/files_sharing/tests/activity.php
index f7f324cdfc..fa62674995 100644
--- a/apps/files_sharing/tests/activity.php
+++ b/apps/files_sharing/tests/activity.php
@@ -22,10 +22,15 @@
  */
 
 namespace OCA\Files_sharing\Tests;
-use OCA\Files_sharing\Tests\TestCase;
 
-
-class Activity extends \OCA\Files_Sharing\Tests\TestCase{
+/**
+ * Class Activity
+ *
+ * @group DB
+ *
+ * @package OCA\Files_sharing\Tests
+ */
+class Activity extends \OCA\Files_Sharing\Tests\TestCase {
 
 	/**
 	 * @var \OCA\Files_Sharing\Activity
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 760bc0591e..36ae339839 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -31,6 +31,8 @@ use OCA\Files_sharing\Tests\TestCase;
 
 /**
  * Class Test_Files_Sharing_Api
+ *
+ * @group DB
  */
 class Test_Files_Sharing_Api extends TestCase {
 
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 8a35350aeb..7db6580813 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -27,6 +27,13 @@ use OCA\Files_sharing\Tests\TestCase;
 use OCP\AppFramework\Http;
 use OCP\Share;
 
+/**
+ * Class ShareesTest
+ *
+ * @group DB
+ *
+ * @package OCA\Files_Sharing\Tests\API
+ */
 class ShareesTest extends TestCase {
 	/** @var Sharees */
 	protected $sharees;
diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php
index 1332342c44..57cdfc4511 100644
--- a/apps/files_sharing/tests/backend.php
+++ b/apps/files_sharing/tests/backend.php
@@ -27,6 +27,8 @@ use OCA\Files_sharing\Tests\TestCase;
 
 /**
  * Class Test_Files_Sharing
+ *
+ * @group DB
  */
 class Test_Files_Sharing_Backend extends TestCase {
 
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 7e7e5ee26d..df7f4fd19a 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -47,6 +47,12 @@ use OCA\Files_sharing\Tests\TestCase;
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * Class Test_Files_Sharing_Cache
+ *
+ * @group DB
+ */
 class Test_Files_Sharing_Cache extends TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php
index 8bebde9f2d..6fb76f10c2 100644
--- a/apps/files_sharing/tests/capabilities.php
+++ b/apps/files_sharing/tests/capabilities.php
@@ -26,6 +26,8 @@ use OCA\Files_Sharing\Tests\TestCase;
 
 /**
  * Class FilesSharingCapabilitiesTest
+ *
+ * @group DB
  */
 class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
index 124cb83e6f..a2e3f36f6a 100644
--- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
+++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
@@ -23,6 +23,13 @@ namespace Test\BackgroundJob;
 
 use OCA\Files_sharing\Lib\DeleteOrphanedSharesJob;
 
+/**
+ * Class DeleteOrphanedSharesJobTest
+ *
+ * @group DB
+ *
+ * @package Test\BackgroundJob
+ */
 class DeleteOrphanedSharesJobTest extends \Test\TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 2a33732d63..de9ce56539 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -27,6 +27,13 @@ namespace OCA\Files_sharing\Tests;
 use OC\Files\Filesystem;
 use OC\Files\View;
 
+/**
+ * Class EtagPropagation
+ *
+ * @group DB
+ *
+ * @package OCA\Files_sharing\Tests
+ */
 class EtagPropagation extends TestCase {
 	/**
 	 * @var \OC\Files\View
diff --git a/apps/files_sharing/tests/expiresharesjobtest.php b/apps/files_sharing/tests/expiresharesjobtest.php
index 63a2c46f64..b21d095e6b 100644
--- a/apps/files_sharing/tests/expiresharesjobtest.php
+++ b/apps/files_sharing/tests/expiresharesjobtest.php
@@ -23,6 +23,13 @@ namespace OCA\Files_Sharing\Tests;
 
 use OCA\Files_Sharing\ExpireSharesJob;
 
+/**
+ * Class ExpireSharesJobTest
+ *
+ * @group DB
+ *
+ * @package OCA\Files_Sharing\Tests
+ */
 class ExpireSharesJobTest extends \Test\TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/external/cache.php b/apps/files_sharing/tests/external/cache.php
index aa3839899c..e44c935d3f 100644
--- a/apps/files_sharing/tests/external/cache.php
+++ b/apps/files_sharing/tests/external/cache.php
@@ -23,24 +23,11 @@ namespace OCA\Files_sharing\Tests\External;
 use OCA\Files_sharing\Tests\TestCase;
 
 /**
- * ownCloud
+ * Class Cache
  *
- * @author Vincent Petry
- * @copyright 2015 Vincent Petry <pvince81@owncloud.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * @group DB
  *
+ * @package OCA\Files_sharing\Tests\External
  */
 class Cache extends TestCase {
 
diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
index 5b93b7494e..015be47270 100644
--- a/apps/files_sharing/tests/external/managertest.php
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -28,6 +28,13 @@ use OCA\Files_Sharing\External\MountProvider;
 use OCA\Files_Sharing\Tests\TestCase;
 use Test\Traits\UserTrait;
 
+/**
+ * Class ManagerTest
+ *
+ * @group DB
+ *
+ * @package OCA\Files_Sharing\Tests\External
+ */
 class ManagerTest extends TestCase {
 	use UserTrait;
 
diff --git a/apps/files_sharing/tests/helper.php b/apps/files_sharing/tests/helper.php
index 34a1389db7..1a4a9ee783 100644
--- a/apps/files_sharing/tests/helper.php
+++ b/apps/files_sharing/tests/helper.php
@@ -24,26 +24,10 @@
 use OCA\Files_sharing\Tests\TestCase;
 
 /**
- * ownCloud
- *
- * @author Bjoern Schiessle
- * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * Class Test_Files_Sharing_Helper
  *
+ * @group DB
  */
-
 class Test_Files_Sharing_Helper extends TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php
index ae1fcf30a5..3b8900f206 100644
--- a/apps/files_sharing/tests/locking.php
+++ b/apps/files_sharing/tests/locking.php
@@ -27,6 +27,13 @@ use OC\Files\View;
 use OC\Lock\MemcacheLockingProvider;
 use OCP\Lock\ILockingProvider;
 
+/**
+ * Class Locking
+ *
+ * @group DB
+ *
+ * @package OCA\Files_sharing\Tests
+ */
 class Locking extends TestCase {
 	/**
 	 * @var \Test\Util\User\Dummy
diff --git a/apps/files_sharing/tests/migrationtest.php b/apps/files_sharing/tests/migrationtest.php
index 522181fbb2..49d76126eb 100644
--- a/apps/files_sharing/tests/migrationtest.php
+++ b/apps/files_sharing/tests/migrationtest.php
@@ -24,6 +24,11 @@
 use OCA\Files_Sharing\Tests\TestCase;
 use OCA\Files_Sharing\Migration;
 
+/**
+ * Class MigrationTest
+ *
+ * @group DB
+ */
 class MigrationTest extends TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 80e727b717..4261ede7a7 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -26,7 +26,11 @@ use OC\Files\Cache\Cache;
 use OC\Files\Storage\Storage;
 use OC\Files\View;
 
-
+/**
+ * Class Test_Files_Sharing_Permissions
+ *
+ * @group DB
+ */
 class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
 
 	/**
diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php
index 300c637c77..a0f0e18b76 100644
--- a/apps/files_sharing/tests/server2server.php
+++ b/apps/files_sharing/tests/server2server.php
@@ -26,6 +26,8 @@ use OCA\Files_Sharing\Tests\TestCase;
 
 /**
  * Class Test_Files_Sharing_Api
+ *
+ * @group DB
  */
 class Test_Files_Sharing_S2S_OCS_API extends TestCase {
 
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index 896191dfe5..b5ba0e3ad5 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -27,6 +27,8 @@ use OCA\Files\Share;
 
 /**
  * Class Test_Files_Sharing
+ *
+ * @group DB
  */
 class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index 94c0ad448b..7b256588f9 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -27,6 +27,8 @@
 
 /**
  * Class Test_Files_Sharing_Api
+ *
+ * @group DB
  */
 class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 3361d2cbd1..0d4a6b5630 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -28,6 +28,8 @@ use OCA\Files\Share;
 
 /**
  * Class Test_Files_Sharing_Api
+ *
+ * @group DB
  */
 class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 
diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php
index 1d09f69449..535a475276 100644
--- a/apps/files_sharing/tests/sizepropagation.php
+++ b/apps/files_sharing/tests/sizepropagation.php
@@ -24,6 +24,13 @@ namespace OCA\Files_sharing\Tests;
 
 use OC\Files\View;
 
+/**
+ * Class SizePropagation
+ *
+ * @group DB
+ *
+ * @package OCA\Files_sharing\Tests
+ */
 class SizePropagation extends TestCase {
 
 	public function testSizePropagationWhenOwnerChangesFile() {
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 6a72a34149..dc5b8ed79d 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -36,6 +36,8 @@ use OCA\Files_Sharing\Appinfo\Application;
 /**
  * Class Test_Files_Sharing_Base
  *
+ * @group DB
+ *
  * Base class for sharing tests.
  */
 abstract class TestCase extends \Test\TestCase {
diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php
index c57070ba64..8de735363d 100644
--- a/apps/files_sharing/tests/unsharechildren.php
+++ b/apps/files_sharing/tests/unsharechildren.php
@@ -26,6 +26,13 @@ namespace OCA\Files_sharing\Tests;
 
 use OCA\Files\Share;
 
+/**
+ * Class UnshareChildren
+ *
+ * @group DB
+ *
+ * @package OCA\Files_sharing\Tests
+ */
 class UnshareChildren extends TestCase {
 
 	protected $subsubfolder;
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 63ab452a5e..312734523b 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -25,6 +25,8 @@
 
 /**
  * Class Test_Files_Sharing_Updater
+ *
+ * @group DB
  */
 class Test_Files_Sharing_Updater extends OCA\Files_Sharing\Tests\TestCase {
 
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index 5e96a3fe68..6443be664a 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -25,6 +25,11 @@
  *
  */
 
+/**
+ * Class Test_Files_Sharing_Watcher
+ *
+ * @group DB
+ */
 class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
 
 	/**
diff --git a/tests/lib/allconfig.php b/tests/lib/allconfig.php
index 7f8ad5ec22..ca3dce12ea 100644
--- a/tests/lib/allconfig.php
+++ b/tests/lib/allconfig.php
@@ -8,6 +8,13 @@
 
 namespace Test;
 
+/**
+ * Class TestAllConfig
+ *
+ * @group DB
+ *
+ * @package Test
+ */
 class TestAllConfig extends \Test\TestCase {
 
 	/** @var  \OCP\IDBConnection */
diff --git a/tests/lib/app.php b/tests/lib/app.php
index bb972e7cf9..1c38a1c161 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright (c) 2012 Bernhard Posselt <dev@bernhard-posselt.com>
  * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
@@ -7,6 +6,12 @@
  * later.
  * See the COPYING-README file.
  */
+
+/**
+ * Class Test_App
+ *
+ * @group DB
+ */
 class Test_App extends \Test\TestCase {
 
 	const TEST_USER1 = 'user1';
diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php
index 98420abe7b..64f0f80e04 100644
--- a/tests/lib/appconfig.php
+++ b/tests/lib/appconfig.php
@@ -11,6 +11,13 @@ namespace Test\Lib;
 
 use Test\TestCase;
 
+/**
+ * Class AppConfig
+ *
+ * @group DB
+ *
+ * @package Test\Lib
+ */
 class AppConfig extends TestCase {
 	/** @var \OCP\IAppConfig */
 	protected $appConfig;
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 05190ca09b..7cba0e6db6 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -128,6 +128,7 @@ class AppTest extends \Test\TestCase {
 
 	protected function tearDown() {
 		rrmdir($this->appPath);
+		parent::tearDown();
 	}
 
 
diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
index badee9f34d..3fa7dc6454 100644
--- a/tests/lib/avatar.php
+++ b/tests/lib/avatar.php
@@ -9,6 +9,11 @@
 
 use OC\Avatar;
 
+/**
+ * Class Test_Avatar
+ *
+ * @group DB
+ */
 class Test_Avatar extends \Test\TestCase {
 	private static $trashBinStatus;
 
diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php
index b329c83009..73b3255c07 100644
--- a/tests/lib/backgroundjob/joblist.php
+++ b/tests/lib/backgroundjob/joblist.php
@@ -9,8 +9,16 @@
 namespace Test\BackgroundJob;
 
 use OCP\BackgroundJob\IJob;
+use Test\TestCase;
 
-class JobList extends \Test\TestCase {
+/**
+ * Class JobList
+ *
+ * @group DB
+ *
+ * @package Test\BackgroundJob
+ */
+class JobList extends TestCase {
 	/**
 	 * @var \OC\BackgroundJob\JobList
 	 */
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index b5f186c541..6db5acdf13 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -22,6 +22,13 @@
 
 namespace Test\Cache;
 
+/**
+ * Class FileCache
+ *
+ * @group DB
+ *
+ * @package Test\Cache
+ */
 class FileCache extends \Test_Cache {
 	/**
 	 * @var string
diff --git a/tests/lib/db.php b/tests/lib/db.php
index 5c25bfb9a5..95eca4774b 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -6,6 +6,11 @@
  * See the COPYING-README file.
  */
 
+/**
+ * Class Test_DB
+ *
+ * @group DB
+ */
 class Test_DB extends \Test\TestCase {
 	protected $backupGlobals = FALSE;
 
diff --git a/tests/lib/db/connection.php b/tests/lib/db/connection.php
index 720b448d0f..ab3b48b259 100644
--- a/tests/lib/db/connection.php
+++ b/tests/lib/db/connection.php
@@ -12,6 +12,13 @@ namespace Test\DB;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use OC\DB\MDB2SchemaManager;
 
+/**
+ * Class Connection
+ *
+ * @group DB
+ *
+ * @package Test\DB
+ */
 class Connection extends \Test\TestCase {
 	/**
 	 * @var \OCP\IDBConnection
diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php
index 8ce6febf3a..e194e701d8 100644
--- a/tests/lib/db/mdb2schemamanager.php
+++ b/tests/lib/db/mdb2schemamanager.php
@@ -11,6 +11,13 @@ namespace Test\DB;
 
 use Doctrine\DBAL\Platforms\OraclePlatform;
 
+/**
+ * Class MDB2SchemaManager
+ *
+ * @group DB
+ *
+ * @package Test\DB
+ */
 class MDB2SchemaManager extends \Test\TestCase {
 
 	protected function tearDown() {
diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php
index 4d55890974..a50c5f1b86 100644
--- a/tests/lib/db/migrator.php
+++ b/tests/lib/db/migrator.php
@@ -15,6 +15,13 @@ use \Doctrine\DBAL\Schema\Schema;
 use \Doctrine\DBAL\Schema\SchemaConfig;
 use OCP\IConfig;
 
+/**
+ * Class Migrator
+ *
+ * @group DB
+ *
+ * @package Test\DB
+ */
 class Migrator extends \Test\TestCase {
 	/**
 	 * @var \Doctrine\DBAL\Connection $connection
diff --git a/tests/lib/db/mysqlmigration.php b/tests/lib/db/mysqlmigration.php
index 6c283e6c59..50b9d91d4e 100644
--- a/tests/lib/db/mysqlmigration.php
+++ b/tests/lib/db/mysqlmigration.php
@@ -6,6 +6,11 @@
  * See the COPYING-README file.
  */
 
+/**
+ * Class TestMySqlMigration
+ *
+ * @group DB
+ */
 class TestMySqlMigration extends \Test\TestCase {
 
 	/** @var \Doctrine\DBAL\Connection */
diff --git a/tests/lib/db/querybuilder/expressionbuildertest.php b/tests/lib/db/querybuilder/expressionbuildertest.php
index f041df0101..0563ff9233 100644
--- a/tests/lib/db/querybuilder/expressionbuildertest.php
+++ b/tests/lib/db/querybuilder/expressionbuildertest.php
@@ -24,6 +24,13 @@ namespace Test\DB\QueryBuilder;
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder as DoctrineExpressionBuilder;
 use OC\DB\QueryBuilder\ExpressionBuilder;
 
+/**
+ * Class ExpressionBuilderTest
+ *
+ * @group DB
+ *
+ * @package Test\DB\QueryBuilder
+ */
 class ExpressionBuilderTest extends \Test\TestCase {
 	/** @var ExpressionBuilder */
 	protected $expressionBuilder;
diff --git a/tests/lib/db/querybuilder/querybuildertest.php b/tests/lib/db/querybuilder/querybuildertest.php
index bbc45fc64f..ca3901ad04 100644
--- a/tests/lib/db/querybuilder/querybuildertest.php
+++ b/tests/lib/db/querybuilder/querybuildertest.php
@@ -27,6 +27,13 @@ use OC\DB\QueryBuilder\Parameter;
 use OC\DB\QueryBuilder\QueryBuilder;
 use OCP\IDBConnection;
 
+/**
+ * Class QueryBuilderTest
+ *
+ * @group DB
+ *
+ * @package Test\DB\QueryBuilder
+ */
 class QueryBuilderTest extends \Test\TestCase {
 	/** @var QueryBuilder */
 	protected $queryBuilder;
diff --git a/tests/lib/db/sqlitemigration.php b/tests/lib/db/sqlitemigration.php
index 9206381ff7..3674d452ba 100644
--- a/tests/lib/db/sqlitemigration.php
+++ b/tests/lib/db/sqlitemigration.php
@@ -6,6 +6,11 @@
  * See the COPYING-README file.
  */
 
+/**
+ * Class TestSqliteMigration
+ *
+ * @group DB
+ */
 class TestSqliteMigration extends \Test\TestCase {
 
 	/** @var \Doctrine\DBAL\Connection */
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index 97307664b6..46d7559acc 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -9,6 +9,11 @@
 
 use OCP\Security\ISecureRandom;
 
+/**
+ * Class Test_DBSchema
+ *
+ * @group DB
+ */
 class Test_DBSchema extends \Test\TestCase {
 	protected $schema_file = 'static://test_db_scheme';
 	protected $schema_file2 = 'static://test_db_scheme2';
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index c5395a97fd..503d25597c 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -16,6 +16,13 @@ class LongId extends \OC\Files\Storage\Temporary {
 	}
 }
 
+/**
+ * Class Cache
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class Cache extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Temporary $storage ;
diff --git a/tests/lib/files/cache/changepropagator.php b/tests/lib/files/cache/changepropagator.php
index 9108330eb9..6e9d9bfae7 100644
--- a/tests/lib/files/cache/changepropagator.php
+++ b/tests/lib/files/cache/changepropagator.php
@@ -12,6 +12,13 @@ use OC\Files\Filesystem;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 
+/**
+ * Class ChangePropagator
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class ChangePropagator extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Cache\ChangePropagator
diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php
index 7ebb053bcf..3adb25fa9d 100644
--- a/tests/lib/files/cache/homecache.php
+++ b/tests/lib/files/cache/homecache.php
@@ -43,6 +43,13 @@ class DummyUser extends \OC\User\User {
 	}
 }
 
+/**
+ * Class HomeCache
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class HomeCache extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Home $storage
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 871b12bac3..8186fe2949 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -8,6 +8,13 @@
 
 namespace Test\Files\Cache;
 
+/**
+ * Class Scanner
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class Scanner extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index 807dcd596f..cdffac464d 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -12,6 +12,13 @@ use OC\Files\Filesystem;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 
+/**
+ * Class Updater
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class Updater extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage
diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php
index c1a0d3d823..1946913bba 100644
--- a/tests/lib/files/cache/updaterlegacy.php
+++ b/tests/lib/files/cache/updaterlegacy.php
@@ -12,6 +12,13 @@ use \OC\Files\Filesystem as Filesystem;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 
+/**
+ * Class UpdaterLegacy
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class UpdaterLegacy extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index acc03cc4c7..cb90e92b47 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -8,6 +8,13 @@
 
 namespace Test\Files\Cache;
 
+/**
+ * Class Watcher
+ *
+ * @group DB
+ *
+ * @package Test\Files\Cache
+ */
 class Watcher extends \Test\TestCase {
 
 	/**
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
index 1b51030d4a..7fbeae8882 100644
--- a/tests/lib/files/etagtest.php
+++ b/tests/lib/files/etagtest.php
@@ -11,6 +11,13 @@ namespace Test\Files;
 use OC\Files\Filesystem;
 use OCP\Share;
 
+/**
+ * Class EtagTest
+ *
+ * @group DB
+ *
+ * @package Test\Files
+ */
 class EtagTest extends \Test\TestCase {
 	private $datadir;
 
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 15a7c23540..7829eb9d70 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -51,6 +51,13 @@ class DummyMountProvider implements IMountProvider {
 	}
 }
 
+/**
+ * Class Filesystem
+ *
+ * @group DB
+ *
+ * @package Test\Files
+ */
 class Filesystem extends \Test\TestCase {
 
 	const TEST_FILESYSTEM_USER1 = "test-filesystem-user1";
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index 5580b40a12..addc7e98f4 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -13,6 +13,13 @@ use OC\Files\Storage\Temporary;
 use OC\Files\View;
 use OC\User\User;
 
+/**
+ * Class IntegrationTests
+ *
+ * @group DB
+ *
+ * @package Test\Files\Node
+ */
 class IntegrationTests extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Node\Root $root
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php
index 6d59078aa7..63332af68d 100644
--- a/tests/lib/files/objectstore/swift.php
+++ b/tests/lib/files/objectstore/swift.php
@@ -23,6 +23,13 @@ namespace OCA\ObjectStore\Tests\Unit;
 use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\ObjectStore\Swift as ObjectStoreToTest;
 
+/**
+ * Class Swift
+ *
+ * @group DB
+ *
+ * @package OCA\ObjectStore\Tests\Unit
+ */
 class Swift extends \Test\Files\Storage\Storage {
 
 	/**
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index b731c6992e..2a50c2a622 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -40,6 +40,13 @@ class TestScanner extends \OC\Files\Utils\Scanner {
 	}
 }
 
+/**
+ * Class Scanner
+ *
+ * @group DB
+ *
+ * @package Test\Files\Utils
+ */
 class Scanner extends \Test\TestCase {
 	/**
 	 * @var \Test\Util\User\Dummy
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index f0bad5abd1..186cf28d7c 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -40,6 +40,13 @@ class TemporaryNoLocal extends \OC\Files\Storage\Temporary {
 	}
 }
 
+/**
+ * Class View
+ *
+ * @group DB
+ *
+ * @package Test\Files
+ */
 class View extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage[] $storages
diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php
index 62c189489d..ce41a6c635 100644
--- a/tests/lib/group/backend.php
+++ b/tests/lib/group/backend.php
@@ -20,6 +20,11 @@
 *
 */
 
+/**
+ * Class Test_Group_Backend
+ *
+ * @group DB
+ */
 abstract class Test_Group_Backend extends \Test\TestCase {
 	/**
 	 * @var OC_Group_Backend $backend
diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php
index 10958a6ccd..3997ff8bba 100644
--- a/tests/lib/group/database.php
+++ b/tests/lib/group/database.php
@@ -20,6 +20,11 @@
 *
 */
 
+/**
+ * Class Test_Group_Database
+ *
+ * @group DB
+ */
 class Test_Group_Database extends Test_Group_Backend {
 	private $groups=array();
 
diff --git a/tests/lib/group/dummy.php b/tests/lib/group/dummy.php
index b4456c8f7e..6836f89d3f 100644
--- a/tests/lib/group/dummy.php
+++ b/tests/lib/group/dummy.php
@@ -20,6 +20,11 @@
 *
 */
 
+/**
+ * Class Test_Group_Dummy
+ *
+ * @group DB
+ */
 class Test_Group_Dummy extends Test_Group_Backend {
 	protected function setUp() {
 		parent::setUp();
diff --git a/tests/lib/lock/dblockingprovider.php b/tests/lib/lock/dblockingprovider.php
index 2360052b4a..d679b1ea67 100644
--- a/tests/lib/lock/dblockingprovider.php
+++ b/tests/lib/lock/dblockingprovider.php
@@ -23,6 +23,13 @@ namespace Test\Lock;
 
 use OCP\Lock\ILockingProvider;
 
+/**
+ * Class DBLockingProvider
+ *
+ * @group DB
+ *
+ * @package Test\Lock
+ */
 class DBLockingProvider extends LockingProvider {
 	/**
 	 * @var \OC\Lock\DBLockingProvider
diff --git a/tests/lib/repair/cleantags.php b/tests/lib/repair/cleantags.php
index 896dd333cc..9773a59177 100644
--- a/tests/lib/repair/cleantags.php
+++ b/tests/lib/repair/cleantags.php
@@ -11,6 +11,8 @@ namespace Test\Repair;
 /**
  * Tests for the cleaning the tags tables
  *
+ * @group DB
+ *
  * @see \OC\Repair\CleanTags
  */
 class CleanTags extends \Test\TestCase {
diff --git a/tests/lib/repair/dropoldjobs.php b/tests/lib/repair/dropoldjobs.php
index 27d7860c63..a85c6506db 100644
--- a/tests/lib/repair/dropoldjobs.php
+++ b/tests/lib/repair/dropoldjobs.php
@@ -13,6 +13,8 @@ use OCP\BackgroundJob\IJobList;
 /**
  * Tests for the dropping old tables
  *
+ * @group DB
+ *
  * @see \OC\Repair\DropOldTables
  */
 class DropOldJobs extends \Test\TestCase {
diff --git a/tests/lib/repair/dropoldtables.php b/tests/lib/repair/dropoldtables.php
index 244d883794..6ece8cf04d 100644
--- a/tests/lib/repair/dropoldtables.php
+++ b/tests/lib/repair/dropoldtables.php
@@ -11,6 +11,8 @@ namespace Test\Repair;
 /**
  * Tests for the dropping old tables
  *
+ * @group DB
+ *
  * @see \OC\Repair\DropOldTables
  */
 class DropOldTables extends \Test\TestCase {
diff --git a/tests/lib/repair/oldgroupmembershipsharestest.php b/tests/lib/repair/oldgroupmembershipsharestest.php
index 272e1ef09c..f02babab21 100644
--- a/tests/lib/repair/oldgroupmembershipsharestest.php
+++ b/tests/lib/repair/oldgroupmembershipsharestest.php
@@ -11,6 +11,13 @@ namespace Test\Repair;
 use OC\Repair\OldGroupMembershipShares;
 use OC\Share\Constants;
 
+/**
+ * Class OldGroupMembershipSharesTest
+ *
+ * @group DB
+ *
+ * @package Test\Repair
+ */
 class OldGroupMembershipSharesTest extends \Test\TestCase {
 
 	/** @var OldGroupMembershipShares */
diff --git a/tests/lib/repair/removegetetagentriestest.php b/tests/lib/repair/removegetetagentriestest.php
index 43b7bf323c..12f0ae8a8d 100644
--- a/tests/lib/repair/removegetetagentriestest.php
+++ b/tests/lib/repair/removegetetagentriestest.php
@@ -24,6 +24,13 @@ namespace Test\Repair;
 use OC\Repair\RemoveGetETagEntries;
 use Test\TestCase;
 
+/**
+ * Class RemoveGetETagEntriesTest
+ *
+ * @group DB
+ *
+ * @package Test\Repair
+ */
 class RemoveGetETagEntriesTest extends TestCase {
 	/** @var \OCP\IDBConnection */
 	protected $connection;
diff --git a/tests/lib/repair/repaircollation.php b/tests/lib/repair/repaircollation.php
index 29dad19000..f9d921e88a 100644
--- a/tests/lib/repair/repaircollation.php
+++ b/tests/lib/repair/repaircollation.php
@@ -19,6 +19,8 @@ class TestCollationRepair extends \OC\Repair\Collation {
 /**
  * Tests for the converting of MySQL tables to InnoDB engine
  *
+ * @group DB
+ *
  * @see \OC\Repair\RepairMimeTypes
  */
 class TestRepairCollation extends \Test\TestCase {
diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php
index 33f7a0e213..e7d2b83c22 100644
--- a/tests/lib/repair/repairinnodb.php
+++ b/tests/lib/repair/repairinnodb.php
@@ -10,6 +10,8 @@ namespace Test\Repair;
 /**
  * Tests for the converting of MySQL tables to InnoDB engine
  *
+ * @group DB
+ *
  * @see \OC\Repair\RepairMimeTypes
  */
 class RepairInnoDB extends \Test\TestCase {
diff --git a/tests/lib/repair/repairinvalidsharestest.php b/tests/lib/repair/repairinvalidsharestest.php
index e8dcaa4da9..9655e0eacb 100644
--- a/tests/lib/repair/repairinvalidsharestest.php
+++ b/tests/lib/repair/repairinvalidsharestest.php
@@ -16,6 +16,8 @@ use Test\TestCase;
 /**
  * Tests for repairing invalid shares
  *
+ * @group DB
+ *
  * @see \OC\Repair\RepairInvalidShares
  */
 class RepairInvalidSharesTest extends TestCase {
diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php
index e1edf70442..44afd6125a 100644
--- a/tests/lib/repair/repairlegacystorage.php
+++ b/tests/lib/repair/repairlegacystorage.php
@@ -15,6 +15,8 @@ use Test\TestCase;
 /**
  * Tests for the converting of legacy storages to home storages.
  *
+ * @group DB
+ *
  * @see \OC\Repair\RepairLegacyStorages
  */
 class RepairLegacyStorages extends TestCase {
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index a0697776e7..1bdaa9a2db 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -11,6 +11,8 @@ namespace Test\Repair;
 /**
  * Tests for the converting of legacy storages to home storages.
  *
+ * @group DB
+ *
  * @see \OC\Repair\RepairMimeTypes
  */
 class RepairMimeTypes extends \Test\TestCase {
diff --git a/tests/lib/repair/repairsqliteautoincrement.php b/tests/lib/repair/repairsqliteautoincrement.php
index 375319bb64..e3bb110191 100644
--- a/tests/lib/repair/repairsqliteautoincrement.php
+++ b/tests/lib/repair/repairsqliteautoincrement.php
@@ -10,6 +10,8 @@ namespace Test\Repair;
 
 /**
  * Tests for fixing the SQLite id recycling
+ *
+ * @group DB
  */
 class RepairSqliteAutoincrement extends \Test\TestCase {
 
diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index 092f9efdd1..43b2f1cf98 100644
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -8,6 +8,11 @@
 
 use \OC\Security\CertificateManager;
 
+/**
+ * Class CertificateManagerTest
+ *
+ * @group DB
+ */
 class CertificateManagerTest extends \Test\TestCase {
 
 	/** @var CertificateManager */
diff --git a/tests/lib/share/hooktests.php b/tests/lib/share/hooktests.php
index f980baf357..7e6aaa259f 100644
--- a/tests/lib/share/hooktests.php
+++ b/tests/lib/share/hooktests.php
@@ -25,6 +25,13 @@ namespace OC\Tests\Share;
 
 use Test\TestCase;
 
+/**
+ * Class HookTests
+ *
+ * @group DB
+ *
+ * @package OC\Tests\Share
+ */
 class HookTests extends TestCase {
 
 	protected function setUp() {
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index e8127aefe8..fa19577cb7 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -19,6 +19,11 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+/**
+ * Class Test_Share
+ *
+ * @group DB
+ */
 class Test_Share extends \Test\TestCase {
 
 	protected $itemType;
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 1a13d64679..a8f59ff16e 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -20,12 +20,17 @@
 *
 */
 
+/**
+ * Class Test_Tags
+ *
+ * @group DB
+ */
 class Test_Tags extends \Test\TestCase {
 
 	protected $objectType;
-	/** @var \OC\IUser */
+	/** @var \OCP\IUser */
 	protected $user;
-	/** @var \OC\IUserSession */
+	/** @var \OCP\IUserSession */
 	protected $userSession;
 	protected $backupGlobals = FALSE;
 	/** @var \OC\Tagging\TagMapper */
diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php
index 3a6be1ceee..ba44d333a8 100644
--- a/tests/lib/user/database.php
+++ b/tests/lib/user/database.php
@@ -20,6 +20,11 @@
 *
 */
 
+/**
+ * Class Test_User_Database
+ *
+ * @group DB
+ */
 class Test_User_Database extends Test_User_Backend {
 	/** @var array */
 	private $users;