refs #5940 databaseTestCase => integrationTestCase. Fixed some mentions of integration => system

88 files changed, 103 insertions, 104 deletions

diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index 6a9b0ff793..c899ef2824 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -41,7 +41,7 @@ use Piwik\Plugins\CoreUpdater\CoreUpdater;
 use Exception;
 
 /**
- * Base type for all integration test fixtures. Integration test fixtures
+ * Base type for all system test fixtures. System test fixtures
  * add visit and related data to the database before a test is run. Different
  * tests can use the same fixtures.
  *
diff --git a/tests/PHPUnit/Impl/ApiTestConfig.php b/tests/PHPUnit/Impl/ApiTestConfig.php
index 264ad61f9e..5458f88db6 100644
--- a/tests/PHPUnit/Impl/ApiTestConfig.php
+++ b/tests/PHPUnit/Impl/ApiTestConfig.php
@@ -159,7 +159,7 @@ class ApiTestConfig
     /**
      * If supplied, tests will compare API responses with files using a different file prefix.
      * Normally, the test name is used as the test prefix, so this will usually be set to the
-     * name of the integration test. Either that or the value in the test's getOutputPrefix
+     * name of the system test. Either that or the value in the test's getOutputPrefix
      * method.
      *
      * @param string|bool eg, `'OneVisitorTwoVisitsTest'`
@@ -205,7 +205,7 @@ class ApiTestConfig
             }
 
             if (!property_exists($this, $key)) {
-                throw new Exception("Invalid API test property '$key'! Check your Integration tests.");
+                throw new Exception("Invalid API test property '$key'! Check your System tests.");
             }
 
             $this->$key = $value;
diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php
index e0221b1392..211a0ca259 100755
--- a/tests/PHPUnit/Integration/AnnotationsTest.php
+++ b/tests/PHPUnit/Integration/AnnotationsTest.php
@@ -16,7 +16,7 @@ use FakeAccess;
 use Exception;
 
 /**
- * @group Integration
+ * @group Plugins
  * @group AnnotationsTest
  */
 class AnnotationsTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
index a25b369f7e..086be417c9 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
+++ b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
  * It will return metadata about all API reports from all plugins
  * as well as the data itself, pre-processed and ready to be displayed
  *
- * @group Integration
+ * @group Plugins
  * @group ApiGetReportMetadataTest
  */
 class ApiGetReportMetadataTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
index d9258c9693..824362ca95 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
+++ b/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\InvalidVisits;
  * test the Yearly metadata API response,
  * with no visits, with custom response language
  *
- * @group Integration
+ * @group Plugins
  * @group ApiGetReportMetadataYearTest
  */
 class ApiGetReportMetadataYearTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 83a580a916..eefe9fdca9 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -20,7 +20,7 @@ use Exception;
  * This tests that, when archiving is disabled,
  *  then Piwik API will return data that was pre-processed during archive.php run
  *
- * @group Integration
+ * @group Core
  * @group ArchiveCronTest
  */
 class ArchiveCronTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/ArchiveInvalidationTest.php b/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
index e2a30a688b..b600aca355 100644
--- a/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
+++ b/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
@@ -20,7 +20,7 @@ use Exception;
  * - on one or multiple websites
  * - for a given set of dates (and optional period)
  *
- * @group Integration
+ * @group Core
  * @group ArchiveInvalidationTest
  */
 class ArchiveInvalidationTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php
index bc7ec439af..6b245d1dc2 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/Integration/ArchiveWebTest.php
@@ -17,7 +17,7 @@ use Exception;
 /**
  * Tests to call the archive.php script via web and check there is no error.
  *
- * @group Integration
+ * @group Core
  * @group ArchiveWebTest
  */
 class ArchiveWebTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php
index 8560caf468..cdb717ef88 100644
--- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php
+++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixture;
  * testing a the auto suggest API for all known segments
  *
  * @group AutoSuggestAPITest
- * @group Integration
+ * @group Core
  */
 class AutoSuggestAPITest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 57b30cfe1b..9c3bf0c9a3 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixture;
  * Tests that Piwik 2.0 works w/ data from Piwik 1.12.
  *
  * @group BackwardsCompatibility1XTest
- * @group Integration
+ * @group Core
  */
 class BackwardsCompatibility1XTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
index 0bb351a280..806b9c3433 100755
--- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
@@ -18,7 +18,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
  * Test Piwik's report limiting code. Make sure the datatable_archiving_maximum_rows_...
  * config options limit the size of certain reports when archiving.
  *
- * @group Integration
+ * @group Core
  * @group BlobReportLimitingTest
  */
 class BlobReportLimitingTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/Core/AccessTest.php b/tests/PHPUnit/Integration/Core/AccessTest.php
index ec1eb9bd29..12cd119d8c 100644
--- a/tests/PHPUnit/Integration/Core/AccessTest.php
+++ b/tests/PHPUnit/Integration/Core/AccessTest.php
@@ -13,7 +13,7 @@ use Piwik\AuthResult;
  *
  * @group Core
  */
-class Core_AccessTest extends DatabaseTestCase
+class Core_AccessTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
index eaa6d6807d..65f1dd0c7f 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
@@ -42,7 +42,7 @@ class Core_ArchiveProcessorTest extends ArchiveProcessor\Loader {
  *
  * @group Core
  */
-class Core_ArchiveProcessingTest extends DatabaseTestCase
+class Core_ArchiveProcessingTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
index eca1d85aea..b9826dc676 100644
--- a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
+++ b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
@@ -12,7 +12,7 @@ use Piwik\CronArchive\SharedSiteIds;
  * @group Core
  * @group SharedSiteIdsTest
  */
-class SharedSiteIdsTest extends DatabaseTestCase
+class SharedSiteIdsTest extends IntegrationTestCase
 {
     /**
      * @var SharedSiteIds
diff --git a/tests/PHPUnit/Integration/Core/DbTest.php b/tests/PHPUnit/Integration/Core/DbTest.php
index daa2c33ecb..aacef131e9 100644
--- a/tests/PHPUnit/Integration/Core/DbTest.php
+++ b/tests/PHPUnit/Integration/Core/DbTest.php
@@ -13,7 +13,7 @@ use Piwik\Db;
  *
  * @group Core
  */
-class Core_DbTest extends DatabaseTestCase
+class Core_DbTest extends IntegrationTestCase
 {
 
     public function test_getColumnNamesFromTable()
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
index a3923183ae..b7271dc866 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -21,7 +21,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
  * @group Core
  * @group Core_LogTest
  */
-class Core_LogTest extends DatabaseTestCase
+class Core_LogTest extends IntegrationTestCase
 {
     const TESTMESSAGE = 'test%smessage';
     const STRING_MESSAGE_FORMAT = '[%tag%] %message%';
diff --git a/tests/PHPUnit/Integration/Core/OptionTest.php b/tests/PHPUnit/Integration/Core/OptionTest.php
index 41a12df3fd..6bab1cf65b 100644
--- a/tests/PHPUnit/Integration/Core/OptionTest.php
+++ b/tests/PHPUnit/Integration/Core/OptionTest.php
@@ -15,7 +15,7 @@ use Piwik\Option;
  * @group Core
  * @group Core_OptionTest
  */
-class Core_OptionTest extends DatabaseTestCase
+class Core_OptionTest extends IntegrationTestCase
 {
     /**
      * @group Core
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index 3ec353b2f2..fc04c81398 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -17,7 +17,7 @@ use Piwik\Translate;
  *
  * @group Core
  */
-class Core_PiwikTest extends DatabaseTestCase
+class Core_PiwikTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
index ec0fd83d0a..3846f4cd15 100644
--- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
+++ b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
@@ -28,7 +28,7 @@ class CorePluginSettingsTest extends \Piwik\Plugins\ExampleSettingsPlugin\Settin
  * @group Core
  * @group PluginSettings
  */
-class Core_Plugin_SettingsTest extends DatabaseTestCase
+class Core_Plugin_SettingsTest extends IntegrationTestCase
 {
     /**
      * @var CorePluginSettingsTest
diff --git a/tests/PHPUnit/Integration/Core/ReportTest.php b/tests/PHPUnit/Integration/Core/ReportTest.php
index f935416675..a7dc7509c4 100644
--- a/tests/PHPUnit/Integration/Core/ReportTest.php
+++ b/tests/PHPUnit/Integration/Core/ReportTest.php
@@ -71,7 +71,7 @@ class GetDisabledReport extends GetBasicReport
 /**
  * @group Core
  */
-class Plugin_ReportTest extends DatabaseTestCase
+class Plugin_ReportTest extends IntegrationTestCase
 {
     /**
      * @var Report
diff --git a/tests/PHPUnit/Integration/Core/SegmentTest.php b/tests/PHPUnit/Integration/Core/SegmentTest.php
index 3fddab94b2..00312063c0 100644
--- a/tests/PHPUnit/Integration/Core/SegmentTest.php
+++ b/tests/PHPUnit/Integration/Core/SegmentTest.php
@@ -12,7 +12,7 @@ use Piwik\Segment;
 /**
  * @group SegmentTest
  */
-class SegmentTest extends DatabaseTestCase
+class SegmentTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/Core/SqlTest.php
index 194fcc3e22..843e4e950a 100755
--- a/tests/PHPUnit/Integration/Core/SqlTest.php
+++ b/tests/PHPUnit/Integration/Core/SqlTest.php
@@ -9,7 +9,7 @@ use Piwik\Db;
  *
  * @group Core
  */
-class Core_SqlTest extends DatabaseTestCase
+class Core_SqlTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
index 02b3f1e8c1..2b7ea04ac0 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
@@ -21,7 +21,7 @@ use Piwik\Plugin\Manager as PluginManager;
  *
  * @group Core
  */
-class Core_Tracker_ActionTest extends DatabaseTestCase
+class Core_Tracker_ActionTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/DbTest.php b/tests/PHPUnit/Integration/Core/Tracker/DbTest.php
index ef738d5515..71fd3a97fd 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/DbTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/DbTest.php
@@ -14,7 +14,7 @@ use Piwik\Db;
  * @group Core
  * @group TrackerDbTest
  */
-class Core_Tracker_DbTest extends DatabaseTestCase
+class Core_Tracker_DbTest extends IntegrationTestCase
 {
     public function test_rowCount_whenUpdating_returnsAllMatchedRowsNotOnlyUpdatedRows()
     {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php b/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
index 7c3b2e9ed5..9910d7f51d 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
@@ -135,7 +135,7 @@ class FakeTrackerVisit extends \Piwik\Tracker\Visit
 /**
  * @group Core
  */
-class VisitTest extends DatabaseTestCase
+class VisitTest extends IntegrationTestCase
 {
 
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
index c748b4ddb7..69c1569251 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
@@ -16,7 +16,7 @@ use Piwik\Tracker\VisitExcluded;
  *
  * @group Core
  */
-class Core_Tracker_VisitTest extends DatabaseTestCase
+class Core_Tracker_VisitTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/TrackerTest.php b/tests/PHPUnit/Integration/Core/TrackerTest.php
index a5eb8cbcb8..c8176a1a89 100644
--- a/tests/PHPUnit/Integration/Core/TrackerTest.php
+++ b/tests/PHPUnit/Integration/Core/TrackerTest.php
@@ -11,7 +11,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group Core
  */
-class Core_TrackerTest extends DatabaseTestCase
+class Core_TrackerTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php b/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php
index 7549dac8a9..a8b6dfc27a 100644
--- a/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php
+++ b/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php
@@ -7,7 +7,7 @@ use Piwik\Translate;
  *
  * @group Core
  */
-class Core_TravisEnvironmentTest extends DatabaseTestCase
+class Core_TravisEnvironmentTest extends IntegrationTestCase
 {
     public function testUsageOfCorrectMysqlAdapter()
     {
diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/Core/UpdaterTest.php
index 6745a3fe1d..a3070a6950 100644
--- a/tests/PHPUnit/Integration/Core/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/Core/UpdaterTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration\Core;
 
-use DatabaseTestCase;
+use IntegrationTestCase;
 use Piwik\Updater;
 use Piwik\Tests\Fixture;
 
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixture;
  * @group Core
  * @group Core_UpdaterTest
  */
-class UpdaterTest extends DatabaseTestCase
+class UpdaterTest extends IntegrationTestCase
 {
     public function testUpdaterChecksCoreVersionAndDetectsUpdateFile()
     {
diff --git a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php
index 65cdf9abe8..394bfe4039 100644
--- a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php
+++ b/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php
@@ -14,7 +14,7 @@ use Piwik\ViewDataTable\Manager as ViewDataTableManager;
  * @group Core
  * @group ViewDataTable
  */
-class Core_Plugin_ViewDataTable_ManagerTest extends DatabaseTestCase
+class Core_Plugin_ViewDataTable_ManagerTest extends IntegrationTestCase
 {
 
     public function setUp()
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
index 552c99129d..a616bdd5bf 100644
--- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixture;
  *
  * @group Core
  */
-class Core_WidgetsListTest extends DatabaseTestCase
+class Core_WidgetsListTest extends IntegrationTestCase
 {
     /**
      * @group Core
diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/Integration/CsvExportTest.php
index ef0f839623..bc77b32723 100755
--- a/tests/PHPUnit/Integration/CsvExportTest.php
+++ b/tests/PHPUnit/Integration/CsvExportTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * Test CSV export with Expanded rows, Translated labels, Different languages
  *
  * @group CsvExportTest
- * @group Integration
+ * @group Core
  */
 class CsvExportTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/CustomEventsTest.php b/tests/PHPUnit/Integration/CustomEventsTest.php
index 75d9bca3c6..44d1c70611 100644
--- a/tests/PHPUnit/Integration/CustomEventsTest.php
+++ b/tests/PHPUnit/Integration/CustomEventsTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
  * Testing Custom Events
  *
  * @group CustomEventsTest
- * @group Integration
+ * @group Plugins
  */
 class CustomEventsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
index fb9837228e..bb642d4f7f 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems;
  * Tests API methods after ecommerce orders are tracked.
  *
  * @group EcommerceOrderWithItemsTest
- * @group Integration
+ * @group Plugins
  */
 class EcommerceOrderWithItemsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/Integration/FlattenReportsTest.php
index 794431cdb5..d045f2d634 100644
--- a/tests/PHPUnit/Integration/FlattenReportsTest.php
+++ b/tests/PHPUnit/Integration/FlattenReportsTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars;
  * Tests the flattening of reports.
  *
  * @group FlattenReportsTest
- * @group Integration
+ * @group Core
  */
 class FlattenReportsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
index 7a48626565..21a43b235c 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\ManySitesImportedLogs;
  * Tests the log importer.
  *
  * @group ImportLogsTest
- * @group Integration
+ * @group Core
  */
 class ImportLogsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php
index a1ef597384..710c464e3e 100644
--- a/tests/PHPUnit/Integration/LabelFilterTest.php
+++ b/tests/PHPUnit/Integration/LabelFilterTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\OneVisitSeveralPageViews;
  * This is not possible as unit test, since it loads data from the archive.
  *
  * @group LabelFilterTest
- * @group Integration
+ * @group Core
  */
 class LabelFilterTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
index cb02522740..fdc23e38c0 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
@@ -21,7 +21,7 @@ use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
  * TODO Test PECL implementation somehow. (The PECL module must point to the test dir, not the real one.)
  *
  * @group ManyVisitorsOneWebsiteTest
- * @group Integration
+ * @group Core
  */
 class ManyVisitorsOneWebsiteTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
index f97feac378..d347dbf0f4 100644
--- a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
+++ b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\ThreeSitesWithSharedVisitors;
 use Piwik\Tests\SystemTestCase;
 
 /**
- * @group Integration
+ * @group Core
  * @group MultipleSitesArchivingTest
  */
 class MultipleSitesArchivingTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php
index 01b70af1eb..14c5f57a45 100755
--- a/tests/PHPUnit/Integration/NoVisitTest.php
+++ b/tests/PHPUnit/Integration/NoVisitTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\InvalidVisits;
  * API will archive and output empty stats.
  *
  * @group NoVisitTest
- * @group Integration
+ * @group Core
  */
 class NoVisitTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php
index bdc72869be..e7521e0ef0 100755
--- a/tests/PHPUnit/Integration/NonUnicodeTest.php
+++ b/tests/PHPUnit/Integration/NonUnicodeTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles;
  * used in URL query params of visits.
  *
  * @group NonUnicodeTest
- * @group Integration
+ * @group Core
  */
 class NonUnicodeTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
index b16d831945..ad3a7df82b 100644
--- a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\SomeVisitsWithLongUrls;
  * Tests that filter_truncate works recursively in Page URLs report AND in the case there are 2 different data Keywords -> search engine
  *
  * @group OneVisitorLongUrlsTruncatedTest
- * @group Integration
+ * @group Core
  */
 class OneVisitorLongUrlsTruncatedTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
index df214dad79..404d0b7a4d 100755
--- a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot;
  * Also test that Live! will link to the search result page URL rather than the exact referrer URL
  * when the referrer URL is google.XX/url.... which is a redirect to landing page rather than the search result URL
  *
- * @group Integration
+ * @group Core
  * @group OneVisitorNoKeywordSpecifiedTest
  */
 class OneVisitorNoKeywordSpecifiedTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 2d2d1e1105..531e5b9c35 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
  * archives are created.
  *
  * @group OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest
- * @group Integration
+ * @group Core
  */
 class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
index 5b60487d95..f2b68d88e9 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
  * - and more
  *
  * @group OneVisitorOneWebsiteSeveralDaysDateRangeTest
- * @group Integration
+ * @group Core
  */
 class OneVisitorOneWebsiteSeveralDaysDateRangeTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php b/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
index 22b31b91f0..73fccc5de6 100644
--- a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
@@ -11,7 +11,7 @@ use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitOverSeveralDaysImportedLogs;
 
 /**
- * @group Integration
+ * @group Core
  * @group OneVisitorSeveralDaysImportedInRandomOrderTest
  */
 class OneVisitorSeveralDaysImportedInRandomOrderTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
index 63a49436c9..6e5d1b3c96 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
@@ -23,7 +23,7 @@ use Exception;
  *   URL matching, with custom referrer and keyword
  *   NO cookie support
  *
- * @group Integration
+ * @group Core
  * @group OneVisitorTwoVisitsTest
  */
 class OneVisitorTwoVisitsTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
index 1245aacd2d..9721a78670 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
  * in the reporting data (more accurate unique visitor count, better referrer tracking for goals, etc.)
  *
  * @group OneVisitorTwoVisitsWithCookieSupportTest
- * @group Integration
+ * @group Core
  */
 class OneVisitorTwoVisitsWithCookieSupportTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
index 0ec4358d6f..b07013ae9d 100755
--- a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
+++ b/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * test Metadata API + period=range&date=lastN
  *
  * @group PeriodIsRangeDateIsLastNMetadataAndNormalAPITest
- * @group Integration
+ * @group Core
  */
 class PeriodIsRangeDateIsLastNMetadataAndNormalAPITest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/PivotByQueryParamTest.php b/tests/PHPUnit/Integration/PivotByQueryParamTest.php
index b0d14325cf..ec320d2705 100644
--- a/tests/PHPUnit/Integration/PivotByQueryParamTest.php
+++ b/tests/PHPUnit/Integration/PivotByQueryParamTest.php
@@ -13,7 +13,7 @@ use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider;
 use Piwik\Tests\SystemTestCase;
 
 /**
- * @group Integration
+ * @group Core
  * @group PivotByQueryParamTest
  */
 class PivotByQueryParamTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
index 42ec5753b4..a54ab52cde 100644
--- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
+++ b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
@@ -15,7 +15,7 @@ use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
  *
  * @group Plugins
  */
-class Plugins_CorePluginsAdmin_UpdateCommunicationTest extends DatabaseTestCase
+class Plugins_CorePluginsAdmin_UpdateCommunicationTest extends IntegrationTestCase
 {
     /**
      * @var UpdateCommunication
diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
index 2ecccd2bf5..07fafc5609 100644
--- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
+++ b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
@@ -17,7 +17,7 @@ use Piwik\Version;
  *
  * @group Plugins
  */
-class Plugins_CoreUpdater_UpdateCommunicationTest extends DatabaseTestCase
+class Plugins_CoreUpdater_UpdateCommunicationTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index d2404e49c2..ded63d53fb 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php
@@ -19,7 +19,7 @@ require_once 'Login/Auth.php';
  * @group Plugins
  * @group Plugins_LoginTest
  */
-class Plugins_LoginTest extends DatabaseTestCase
+class Plugins_LoginTest extends IntegrationTestCase
 {
 
     /**
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
index 1d6bf9f7d2..a4ed9aa671 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -18,7 +18,7 @@ use Piwik\Plugins\SitesManager\API as APISitesManager;
  *
  * @group Plugins
  */
-class Plugins_MobileMessagingTest extends DatabaseTestCase
+class Plugins_MobileMessagingTest extends IntegrationTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
index 4b30d562c8..c973a7e839 100644
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
@@ -15,7 +15,7 @@ use Piwik\Plugins\SitesManager\API as APISitesManager;
  *
  * @group Plugins
  */
-class Plugins_MultiSitesTest extends DatabaseTestCase
+class Plugins_MultiSitesTest extends IntegrationTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
index fb2ad94a40..06a5b691e7 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
  *
  * @group Plugins
  */
-class Plugins_PrivacyManagerConfigTest extends DatabaseTestCase
+class Plugins_PrivacyManagerConfigTest extends IntegrationTestCase
 {
     /**
      * @var PrivacyManagerConfig
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
index 7b1836c850..ac95705bd3 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
@@ -13,7 +13,7 @@ use Piwik\Plugins\PrivacyManager\PrivacyManager;
  *
  * @group Plugins
  */
-class Plugins_PrivacyManagerTest extends DatabaseTestCase
+class Plugins_PrivacyManagerTest extends IntegrationTestCase
 {
     /**
      * @var PrivacyManager
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 9ce8430f42..89ee99e099 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -25,7 +25,7 @@ require_once 'ScheduledReports/ScheduledReports.php';
  *
  * @group Plugins
  */
-class Plugins_ScheduledReportsTest extends DatabaseTestCase
+class Plugins_ScheduledReportsTest extends IntegrationTestCase
 {
     private $idSite = 1;
 
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
index 666b042bad..ca91862564 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
@@ -17,7 +17,7 @@ use Piwik\Plugins\SitesManager\API as APISitesManager;
  *
  * @group Plugins
  */
-class Plugins_SegmentEditorTest extends DatabaseTestCase
+class Plugins_SegmentEditorTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
index ff5b68989f..cf54ee6140 100644
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
@@ -15,7 +15,7 @@ use Piwik\Site;
  *
  * @group Plugins
  */
-class Plugins_SitesManagerTest extends DatabaseTestCase
+class Plugins_SitesManagerTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
index 41b4fe2ae2..5f039b7efc 100644
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
@@ -19,7 +19,7 @@ use Piwik\Translate;
  *
  * @group Plugins
  */
-class Plugins_UsersManagerTest extends DatabaseTestCase
+class Plugins_UsersManagerTest extends IntegrationTestCase
 {
     /**
      * @var API
diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/Integration/PrivacyManagerTest.php
index fd291aaa92..55cc3733a0 100644
--- a/tests/PHPUnit/Integration/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/PrivacyManagerTest.php
@@ -32,7 +32,7 @@ require_once 'PrivacyManager/PrivacyManager.php';
 
 /**
  * @group PrivacyManagerTest
- * @group Integration
+ * @group Plugins
  */
 class PrivacyManagerTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/Integration/PurgeDataTest.php
index 2da485cb4a..816732a2a7 100755
--- a/tests/PHPUnit/Integration/PurgeDataTest.php
+++ b/tests/PHPUnit/Integration/PurgeDataTest.php
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 /**
  * TODO: shouldn't this be merged w/ PrivacyManagerTest? the original data purging tests are there
  *
- * @group Integration
+ * @group Core
  * @group PurgeDataTest
  */
 class PurgeDataTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php
index f7e6564587..141aa1154c 100755
--- a/tests/PHPUnit/Integration/RowEvolutionTest.php
+++ b/tests/PHPUnit/Integration/RowEvolutionTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferr
  * Tests the method API.getRowEvolution
  *
  * @group RowEvolutionTest
- * @group Integration
+ * @group Plugins
  */
 class RowEvolutionTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php
index 5c71152ead..4637181cca 100755
--- a/tests/PHPUnit/Integration/SiteSearchTest.php
+++ b/tests/PHPUnit/Integration/SiteSearchTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch;
  * Testing the various use cases w/ internal Site Search tracking
  *
  * @group SiteSearchTest
- * @group Integration
+ * @group Plugins
  */
 class SiteSearchTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TimezonesTest.php b/tests/PHPUnit/Integration/TimezonesTest.php
index e458916a0f..1dc4e1b19c 100644
--- a/tests/PHPUnit/Integration/TimezonesTest.php
+++ b/tests/PHPUnit/Integration/TimezonesTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\VisitsInDifferentTimezones;
  * Test reports using visits for a site with a non-UTC timezone.
  *
  * @group TimezonesTest
- * @group Integration
+ * @group Core
  */
 class TimezonesTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
index 1e29969279..768be87a1e 100755
--- a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
+++ b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics;
  * tests campaign tracking.
  *
  * @group TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest
- * @group Integration
+ * @group Plugins
  */
 class TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
index 178f91c84b..b13cebde75 100755
--- a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
+++ b/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\SomeVisitsAllConversions;
  * conversions per visit.
  *
  * @group TrackGoalsAllowMultipleConversionsPerVisitTest
- * @group Integration
+ * @group Plugins
  */
 class TrackGoalsAllowMultipleConversionsPerVisitTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
index e6873cfa45..97a4ef9e6d 100644
--- a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
+++ b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
  * works well with the use case of a returning visitor being assigned to today's visit
  *
  * @group TrackerWindowLookBackTest
- * @group Integration
+ * @group Plugins
  */
 class TrackerWindowLookBackTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TransitionsTest.php b/tests/PHPUnit/Integration/TransitionsTest.php
index 8bb4dd7d8d..c5ece99ab3 100644
--- a/tests/PHPUnit/Integration/TransitionsTest.php
+++ b/tests/PHPUnit/Integration/TransitionsTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions;
  * Tests the transitions plugin.
  *
  * @group TransitionsTest
- * @group Integration
+ * @group Plugins
  */
 class TransitionsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
index 421697ada6..a43562a337 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
  * Tests IndexedBySite optimizations when archiving is disabled.
  *
  * @group TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest
- * @group Integration
+ * @group Plugins
  */
 class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 7d1d3379b2..7fbc8c03bc 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -18,7 +18,7 @@ require_once 'Goals/Goals.php';
  * on every url.
  *
  * @group TwoVisitorsTwoWebsitesDifferentDaysConversionsTest
- * @group Integration
+ * @group Plugins
  */
 class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index 8458c53269..35c1069787 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -20,7 +20,7 @@ use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
  * Also testing metadata API for multiple periods
  *
  * @group TwoVisitorsTwoWebsitesDifferentDaysTest
- * @group Integration
+ * @group Plugins
  */
 class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
index 5292c3decb..e8373c48e7 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
@@ -13,7 +13,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 /**
  * Tests use of custom variable segments.
  *
- * @group Integration
+ * @group Plugins
  * @group TwoVisitsWithCustomVariablesSegmentContainsTest
  */
 class TwoVisitsWithCustomVariablesSegmentContainsTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
index 6c63bb9359..3856416d15 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
@@ -11,7 +11,7 @@ use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
- * @group Integration
+ * @group Plugins
  * @group TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest
  */
 class TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index 35b5cba9fd..dd0ce7cf57 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixture;
 /**
  * testing a segment containing all supported fields
  *
- * @group Integration
+ * @group Plugins
  * @group TwoVisitsWithCustomVariablesSegmentMatchNONETest
  */
 class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index 159d67bbc7..8502bb3795 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 /**
  * Tests use of custom variable segments.
  *
- * @group Integration
+ * @group Plugins
  * @group TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest
  */
 class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTestCase
@@ -58,8 +58,7 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTest
     }
 
     /**
-     * @depends      testApi
-     * @group        Integration
+     * @depends testApi
      */
     public function testCheck()
     {
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
index e19a87f39b..c41ac7918a 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
@@ -14,7 +14,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * Tests w/ two visits & custom variables.
  *
  * @group TwoVisitsWithCustomVariablesTest
- * @group Integration
+ * @group Plugins
  */
 class TwoVisitsWithCustomVariablesTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php
index c5373dc220..d57ad9c2a5 100644
--- a/tests/PHPUnit/Integration/UrlNormalizationTest.php
+++ b/tests/PHPUnit/Integration/UrlNormalizationTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls;
 /**
  * Tests the URL normalization.
  *
- * @group Integration
+ * @group Core
  * @group UrlNormalizationTest
  */
 class UrlNormalizationTest extends SystemTestCase
diff --git a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php b/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
index b33bff7d53..1bfa1d67df 100644
--- a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
+++ b/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
@@ -15,7 +15,7 @@ use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId;
  * This test tests that when using &cid=, the visitor ID is enforced
  *
  * @group UserIdAndVisitorIdTest
- * @group Integration
+ * @group Plugins
  */
 class UserIdAndVisitorIdTest extends SystemTestCase
 {
diff --git a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
index 51a73339c2..73af6c15c5 100644
--- a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
+++ b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
@@ -17,7 +17,7 @@ use Exception;
  *
  * See also other test: ArchiveInvalidationTest
  *
- * @group Integration
+ * @group Core
  * @group VisitsInPastInvalidateOldReportsTest
  */
 class VisitsInPastInvalidateOldReportsTest extends SystemTestCase
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 715571eba4..f08c7cfac6 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -8,17 +8,17 @@
 use Piwik\Config;
 use Piwik\Db;
 use Piwik\Tests\Fixture;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
- * Tests extending DatabaseTestCase are much slower to run: the setUp will
+ * Tests extending IntegrationTestCase are much slower to run: the setUp will
  * create all Piwik tables in a freshly empty test database.
  *
  * This allows each test method to start from a clean DB and setup initial state to
  * then test it.
  *
  */
-class DatabaseTestCase extends IntegrationTestCase
+class IntegrationTestCase extends SystemTestCase
 {
     /**
      * @var Fixture
@@ -93,4 +93,4 @@ class DatabaseTestCase extends IntegrationTestCase
     }
 }
 
-DatabaseTestCase::$fixture = new Fixture();
\ No newline at end of file
+IntegrationTestCase::$fixture = new Fixture();
\ No newline at end of file
diff --git a/tests/PHPUnit/SystemTestCase.php b/tests/PHPUnit/SystemTestCase.php
index 0a804ae6e6..78bb8ff116 100755
--- a/tests/PHPUnit/SystemTestCase.php
+++ b/tests/PHPUnit/SystemTestCase.php
@@ -29,7 +29,7 @@ use PHPUnit_Framework_TestCase;
 require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
 
 /**
- * Base class for Integration tests.
+ * Base class for System tests.
  *
  * Provides helpers to track data and then call API get* methods to check outputs automatically.
  *
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 82681fe8b3..f85aaa94c6 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -35,7 +35,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
 require_once PIWIK_INCLUDE_PATH . '/core/FrontController.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php';
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/DatabaseTestCase.php';
+require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/SystemTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/ConsoleCommandTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php';
diff --git a/tests/README.md b/tests/README.md
index 865606c12e..24b2699b43 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,4 +1,4 @@
-Piwik comes with unit tests, integration tests, Javascript tests and Webtests.
+Piwik comes with unit tests, integration tests, system tests, Javascript tests and UI tests.
 This document briefly describes how to use and modify Piwik tests.
 
 ## Continuous Integration
@@ -71,22 +71,22 @@ To execute the tests:
 4. 	Run the tests
 
 	$ cd /path/to/piwik/tests/PHPUnit
-	$ phpunit --group Core
-     	$ phpunit --group Plugins
-     	$ phpunit --group Integration
+	$ phpunit --testsuite CoreTests
+    $ phpunit --testsuite PluginTests
+    $ phpunit --testsuite SystemTests
 
-	There are three main groups of tests: Core, Plugins and Integration
+	There are also two main groups of tests: Core and Plugins
 	For example run `phpunit --group Core`
 	to run all Core Piwik tests.
 
 5.	Write more tests :)
 	See ["Writing Unit tests with PHPUnit"](http://www.phpunit.de/manual/current/en/writing-tests-for-phpunit.html)
 
-## Integration Tests
+## System Tests
 
-Integration tests files are in `tests/PHPUnit/Integration/*Test.php`
+System tests files are in `tests/PHPUnit/Integration/*Test.php`
 
-Integration tests allow to test how major Piwik components interact together.
+System tests allow to test how major Piwik components interact together.
 A test will typically generate hits to the Tracker (record visits and page views)
 and then test all API responses and for each API output. It then checks that they match expected XML (or CSV, json, etc.).
 If a test fails, you can compare the processed/ and expected/ directories in a graphical
@@ -102,7 +102,7 @@ Otherwise, if you didn't expect to modify the API outputs, it might be that your
 
 ### Scheduled Reports Tests
 
-As part of our integration tests we generate the scheduled reports (in HTML, PDF & SMS).
+As part of our system tests we generate the scheduled reports (in HTML, PDF & SMS).
 Some of these scheduled reports contain PNG graphs. Depending on the system under test, generated images can differ.
 Therefore, PNG graphs are only tested and compared against "expected" graphs, if the system under test has the same characteristics as the integration server.
 The characteristics of the integration server are described in `SystemTestCase::canImagesBeIncludedInScheduledReports()`
diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md
index 6203313f71..d6976c5ba6 100644
--- a/tests/README.screenshots.md
+++ b/tests/README.screenshots.md
@@ -36,7 +36,7 @@ To fix a broken build, follow these steps:
        (If the screenshot test is for a plugin and not Piwik Core, the expected screenshot should be added to the
        plugin's expected screenshot directory. For example: piwik/plugins/DBStats/tests/UI/expected-ui-screenshots.)
 
-     _Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through Integration and other PHP tests. The UI tests should only test UI behavior._
+     _Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through System and other PHP tests. The UI tests should only test UI behavior._
  * Push the changes (to your code and/or to the expected-ui-screenshots directory.
  * Wait for next UI Tests build [on travis](https://travis-ci.org/piwik/piwik-ui-tests). Hopefully, the build should be green!
 
diff --git a/tests/travis/initiate_ui_tests.sh b/tests/travis/initiate_ui_tests.sh
index 2530b5bbdd..3dc5a3d9b1 100755
--- a/tests/travis/initiate_ui_tests.sh
+++ b/tests/travis/initiate_ui_tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# initiate UI tests before starting integration tests for php 5.5
+# initiate UI tests before starting system tests for php 5.5
 if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.5* ]]; then
     echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)."
     exit
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index 0a168e0e48..7647211a12 100755
--- a/tests/travis/travis.sh
+++ b/tests/travis/travis.sh
@@ -67,9 +67,9 @@ then
         fi
     fi
 else
-    if [ "$COVERAGE" = "Integration" ]
+    if [ "$COVERAGE" = "System" ]
     then
-        echo "Executing non Integration tests in test suite SystemTests..."
+        echo "Executing non System tests in test suite SystemTests..."
         phpunit --configuration phpunit.xml --testsuite SystemTests --exclude-group System --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml || true
     elif [ "$COVERAGE" = "Core" ]
     then