diff --git a/tests/PHPUnit/Integration/Core/AccessTest.php b/tests/PHPUnit/Integration/Core/AccessTest.php
index 4b02d495bd8a827b5c5ec1f03773c7b05387ffd7..78e56937faa17d34f254ce6a227661ed2c310596 100644
--- a/tests/PHPUnit/Integration/Core/AccessTest.php
+++ b/tests/PHPUnit/Integration/Core/AccessTest.php
@@ -8,6 +8,11 @@
 use Piwik\Access;
 use Piwik\AuthResult;
 
+/**
+ * Class Core_AccessTest
+ *
+ * @group Core
+ */
 class Core_AccessTest extends DatabaseTestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
index 39bc7321d903f9e960578036675d608c95cfd599..249c7f3c180b3472c954b437f1567bab636a18a5 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
@@ -38,7 +38,12 @@ class Core_ArchiveProcessorTest extends ArchiveProcessor\Loader {
     }
 }
 
-class ArchiveProcessingTest extends DatabaseTestCase
+/**
+ * Class Core_ArchiveProcessorTest
+ *
+ * @group Core
+ */
+class Core_ArchiveProcessingTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
index ffd227ccfe833fde4f63cbbe85f08bebe2c29537..9e2359d765c4c06b89f23ce9b46914e67ffc93ab 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -15,6 +15,11 @@ require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
 use Piwik\Log;
 use Piwik\Plugins\TestPlugin\TestLoggingUtility;
 
+/**
+ * Class Core_LogTest
+ *
+ * @group Core
+ */
 class Core_LogTest extends DatabaseTestCase
 {
     const TESTMESSAGE = 'test%smessage';
diff --git a/tests/PHPUnit/Integration/Core/OptionTest.php b/tests/PHPUnit/Integration/Core/OptionTest.php
index 8ace6f24875694db64d0e392c38b25eec6ed033c..7cd36cc82a0940514471214cb50b73c8d2b0dfe0 100644
--- a/tests/PHPUnit/Integration/Core/OptionTest.php
+++ b/tests/PHPUnit/Integration/Core/OptionTest.php
@@ -11,6 +11,11 @@ use Piwik\Option;
 
 require_once "Option.php";
 
+/**
+ * Class Core_OptionTest
+ *
+ * @group Core
+ */
 class Core_OptionTest extends DatabaseTestCase
 {
     /**
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index b0df34b09dc944b6a08f01636d9ef023800ab4ed..1f289fde94ea96579e5b1e5fcabf2f4521124bae 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -12,6 +12,11 @@ use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Translate;
 
+/**
+ * Class Core_PiwikTest
+ *
+ * @group Core
+ */
 class Core_PiwikTest extends DatabaseTestCase
 {
     /**
diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/Core/SqlTest.php
index 8aab87022b445d6f5edf31a17bb9b217144e05f6..47a3c23f181eb9ca1ace1da7cba6aee929bbabc1 100755
--- a/tests/PHPUnit/Integration/Core/SqlTest.php
+++ b/tests/PHPUnit/Integration/Core/SqlTest.php
@@ -6,6 +6,8 @@ use Piwik\Db;
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @group Core
  */
 class Core_SqlTest extends DatabaseTestCase
 {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
index 5e86530986c7153380ee9fa5deec2d962652137c..fc32e388b5ec15f8d6574463fa4400b69ead321d 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
@@ -12,6 +12,8 @@ use Piwik\Translate;
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @group Core
  */
 class Core_Tracker_ActionTest extends DatabaseTestCase
 {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
index ff084a449471e4c3fa08b74d9912b690128a0aa1..65a3ecede84ff49b4aa0fe6479326f4850813e3e 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
@@ -11,6 +11,11 @@ use Piwik\Plugins\SitesManager\API;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\VisitExcluded;
 
+/**
+ * Class Core_Tracker_VisitTest
+ *
+ * @group Core
+ */
 class Core_Tracker_VisitTest extends DatabaseTestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/Core/UpdaterTest.php
index a00d6c4086053a27ca57a9e435e7e5b28414415b..87cbe114e450f60380f25c8c3ba98185fb7c53ea 100644
--- a/tests/PHPUnit/Integration/Core/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/Core/UpdaterTest.php
@@ -7,6 +7,11 @@
  */
 use Piwik\Updater;
 
+/**
+ * Class Core_UpdaterTest
+ *
+ * @group Core
+ */
 class Core_UpdaterTest extends DatabaseTestCase
 {
     /**
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
index 72fa57830aef0e1fd55e904c0a3119b52d594d19..451c84274d9f97cc3fc1cece7d0cfc1f564d67e8 100644
--- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
@@ -10,6 +10,11 @@ use Piwik\Access;
 use Piwik\Plugins\Goals\API;
 use Piwik\WidgetsList;
 
+/**
+ * Class Core_WidgetsListTest
+ *
+ * @group Core
+ */
 class Core_WidgetsListTest extends DatabaseTestCase
 {
     /**
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index 25f90720975d44f87f8fecb2b5a645bf90993643..1f02409ff48e2b0ade616825cba23c2ea61283b5 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php
@@ -14,6 +14,11 @@ use Piwik\Plugins\UsersManager\API;
 
 require_once 'Login/Auth.php';
 
+/**
+ * Class Plugins_LoginTest
+ *
+ * @group Plugins
+ */
 class Plugins_LoginTest extends DatabaseTestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
index d08081781c875e81d13f4e3fb83a77b306283bbd..e517589058c78ac85473dca70349ff796d2df05b 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -13,6 +13,11 @@ use Piwik\Plugins\MobileMessaging\SMSProvider;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
+/**
+ * Class Plugins_MobileMessagingTest
+ *
+ * @group Plugins
+ */
 class Plugins_MobileMessagingTest extends DatabaseTestCase
 {
     protected $idSiteAccess;
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
index 72f9f970b539557de593f788d84a83d7fe829fbb..c46e2ba562a9c278e74f762d04cffeafbbacd9d2 100644
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
@@ -10,6 +10,11 @@ use Piwik\Access;
 use Piwik\Plugins\MultiSites\API as APIMultiSites;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
+/**
+ * Class Plugins_MultiSitesTest
+ *
+ * @group Plugins
+ */
 class Plugins_MultiSitesTest extends DatabaseTestCase
 {
     protected $idSiteAccess;
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 9787f73d0019fa8b70a818fc47b5642d510c31ec..be1229b7fbb79649cdaf5c0c771793cc7c3af57e 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -19,6 +19,11 @@ use Piwik\Site;
 
 require_once 'ScheduledReports/ScheduledReports.php';
 
+/**
+ * Class Plugins_ScheduledReportsTest
+ *
+ * @group Plugins
+ */
 class Plugins_ScheduledReportsTest extends DatabaseTestCase
 {
     private $idSite = 1;
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
index 52a0a3a41119e77f879de144447578b71f38324e..4ddf276542cf5ee460d050d5136c49b227b0c993 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
@@ -11,6 +11,11 @@ use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
+/**
+ * Class Plugins_SegmentEditorTest
+ *
+ * @group Plugins
+ */
 class Plugins_SegmentEditorTest extends DatabaseTestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
index aa2eb89ef2249e7be99940d007f443af0f2645bd..d39aaf9c03278efb0e2d74c03326b16002946ef5 100644
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
@@ -10,6 +10,11 @@ use Piwik\Plugins\SitesManager\API;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Site;
 
+/**
+ * Class Plugins_SitesManagerTest
+ *
+ * @group Plugins
+ */
 class Plugins_SitesManagerTest extends DatabaseTestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
index 08da4b001b294b830d8694a540c3600bf242a9b6..3c7b5fcb856d13e4ea7257423beb0b2ff647b3ae 100644
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
@@ -9,6 +9,8 @@ use Piwik\Plugins\UsersManager\API;
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @group Plugins
  */
 class Plugins_UsersManagerTest extends DatabaseTestCase
 {
@@ -69,9 +71,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
         $this->assertEquals($user, $userAfter);
     }
 
-    /**
-     * @group Plugins
-     */
     public function testAllSuperUserIncluded()
     {
         Config::getInstance()->superuser = array(
@@ -118,8 +117,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * bad password => exception
-     *
-     * @group Plugins
      */
     public function testUpdateUserBadpasswd()
     {
@@ -160,7 +157,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
     /**
      *
      * @dataProvider getAddUserInvalidLoginData
-     * @group Plugins
      */
     public function testAddUserWrongLogin($userLogin, $password, $email, $alias)
     {
@@ -175,8 +171,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * existing login => exception
-     *
-     * @group Plugins
      */
     public function testAddUserExistingLogin()
     {
@@ -206,7 +200,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
     /**
      *
      * @dataProvider getWrongPasswordTestData
-     * @group Plugins
      */
     public function testAddUserWrongPassword($userLogin, $password, $email, $alias)
     {
@@ -235,7 +228,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
     /**
      *
      * @dataProvider getWrongEmailTestData
-     * @group Plugins
      */
     public function testAddUserWrongEmail($userLogin, $password, $email, $alias)
     {
@@ -250,8 +242,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * empty email => exception
-     *
-     * @group Plugins
      */
     public function testAddUserEmptyEmail()
     {
@@ -267,8 +257,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * empty alias => use login
-     *
-     * @group Plugins
      */
     public function testAddUserEmptyAlias()
     {
@@ -281,8 +269,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * no alias => use login
-     *
-     * @group Plugins
      */
     public function testAddUserNoAliasSpecified()
     {
@@ -295,8 +281,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * normal test case
-     *
-     * @group Plugins
      */
     public function testAddUser()
     {
@@ -329,8 +313,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * user doesnt exist => exception
-     *
-     * @group Plugins
      */
     public function testSeleteUserDoesntExist()
     {
@@ -347,8 +329,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * empty name, doesnt exists =>exception
-     *
-     * @group Plugins
      */
     public function testDeleteUserEmptyUser()
     {
@@ -363,8 +343,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * null user,, doesnt exists => exception
-     *
-     * @group Plugins
      */
     public function testDeleteUserNullUser()
     {
@@ -379,8 +357,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * normal case, user deleted
-     *
-     * @group Plugins
      */
     public function testDeleteUser()
     {
@@ -419,8 +395,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * no user => exception
-     *
-     * @group Plugins
      */
     public function testGetUserNoUser()
     {
@@ -437,8 +411,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * normal case
-     *
-     * @group Plugins
      */
     public function test_GetUser()
     {
@@ -462,8 +434,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
 
     /**
      * no user => empty array
-     *
-     * @group Plugins
      */
     public function testGetUsersNoUser()
     {
@@ -473,8 +443,6 @@ class Plugins_UsersManagerTest extends DatabaseTestCase
     /**
      * normal case
      * as well as selecting specific user names, comma separated
-     *
-     * @group Plugins
      */
     public function testGetUsers()
     {