refs #5940 IntegrationTestCase => SystemTestCase

59 files changed, 113 insertions, 113 deletions

diff --git a/tests/PHPUnit/BenchmarkTestCase.php b/tests/PHPUnit/BenchmarkTestCase.php
index 28e6128c48..e8ae09bded 100755
--- a/tests/PHPUnit/BenchmarkTestCase.php
+++ b/tests/PHPUnit/BenchmarkTestCase.php
@@ -10,7 +10,7 @@ use Piwik\Db;
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\Fixture;
 
-require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
+require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/SystemTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/LocalTracker.php';
 
 // require fixtures
@@ -21,7 +21,7 @@ foreach (glob(PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Benchmarks/Fixtures/*.php') a
 /**
  * Base class for benchmarks.
  */
-abstract class BenchmarkTestCase extends \Piwik\Tests\IntegrationTestCase
+abstract class BenchmarkTestCase extends \Piwik\Tests\SystemTestCase
 {
     protected static $fixture;
 
diff --git a/tests/PHPUnit/ConsoleCommandTestCase.php b/tests/PHPUnit/ConsoleCommandTestCase.php
index 504d37da95..686cf26998 100644
--- a/tests/PHPUnit/ConsoleCommandTestCase.php
+++ b/tests/PHPUnit/ConsoleCommandTestCase.php
@@ -13,7 +13,7 @@ use Piwik\Console;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
 /**
- * Base class for test cases that test Piwik console commands. Derives from IntegrationTestCase
+ * Base class for test cases that test Piwik console commands. Derives from SystemTestCase
  * so the entire Piwik environment is set up.
  *
  * This will create an ApplicationTester instance (provided by Symfony) which should be used to
@@ -33,7 +33,7 @@ use Symfony\Component\Console\Tester\ApplicationTester;
  *         // other checks
  *     }
  */
-class ConsoleCommandTestCase extends IntegrationTestCase
+class ConsoleCommandTestCase extends SystemTestCase
 {
     protected $applicationTester = null;
 
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index cc72b8498d..6a9b0ff793 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -90,7 +90,7 @@ class Fixture extends PHPUnit_Framework_Assert
         if(\Piwik\SettingsServer::isWindows()) {
             return "C:\Python27\python.exe";
         }
-        if(IntegrationTestCase::isTravisCI()) {
+        if(SystemTestCase::isTravisCI()) {
             return 'python2.6';
         }
         return 'python';
diff --git a/tests/PHPUnit/Impl/ApiTestConfig.php b/tests/PHPUnit/Impl/ApiTestConfig.php
index a2dfab24d4..264ad61f9e 100644
--- a/tests/PHPUnit/Impl/ApiTestConfig.php
+++ b/tests/PHPUnit/Impl/ApiTestConfig.php
@@ -20,7 +20,7 @@ use \Exception;
  * processed before comparison.
  *
  * Instances of this class are not created directly. Instead, an array mapping config
- * property names w/ values is passed to IntegrationTestCase::runApiTests. For example,
+ * property names w/ values is passed to SystemTestCase::runApiTests. For example,
  *
  *     $this->runApiTests("UserCountry", array(
  *         'idSite' => 1,
@@ -135,7 +135,7 @@ class ApiTestConfig
     public $fileExtension = false;
 
     /**
-     * An array of API methods that shouldn't be called. If `'all'` is specified in IntegrationTestCase::runApiTests,
+     * An array of API methods that shouldn't be called. If `'all'` is specified in SystemTestCase::runApiTests,
      * the methods in this property will be ignored when calling all API methods.
      *
      * @var string[]|false eg, `array("Actions", "Referrers.getWebsites", ...)`
diff --git a/tests/PHPUnit/Impl/TestRequestCollection.php b/tests/PHPUnit/Impl/TestRequestCollection.php
index 68cae0ff99..20208765e3 100644
--- a/tests/PHPUnit/Impl/TestRequestCollection.php
+++ b/tests/PHPUnit/Impl/TestRequestCollection.php
@@ -12,7 +12,7 @@ use Piwik\API\DocumentationGenerator;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\UrlHelper;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use \Exception;
 use \PHPUnit_Framework_Assert;
 
@@ -222,7 +222,7 @@ class TestRequestCollection
                                                      ));
 
                     $content = $request->process();
-                    IntegrationTestCase::assertApiResponseHasNoError($content);
+                    SystemTestCase::assertApiResponseHasNoError($content);
 
                     // find first row w/ subtable
                     foreach ($content as $row) {
diff --git a/tests/PHPUnit/Impl/TestRequestResponse.php b/tests/PHPUnit/Impl/TestRequestResponse.php
index f30c27f39f..6ceeb564f2 100644
--- a/tests/PHPUnit/Impl/TestRequestResponse.php
+++ b/tests/PHPUnit/Impl/TestRequestResponse.php
@@ -9,7 +9,7 @@
 namespace Piwik\Tests\Impl;
 
 use Piwik\API\Request;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use PHPUnit_Framework_Assert as Asserts;
 use Exception;
 
@@ -115,7 +115,7 @@ class TestRequestResponse
 
     private function normalizeEncodingPhp533($apiResponse)
     {
-        if(!IntegrationTestCase::isPhpVersion53()
+        if(!SystemTestCase::isPhpVersion53()
             || strpos($apiResponse, '<result') === false) {
             return $apiResponse;
         }
diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php
index 9945b63902..e0221b1392 100755
--- a/tests/PHPUnit/Integration/AnnotationsTest.php
+++ b/tests/PHPUnit/Integration/AnnotationsTest.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Access;
 use Piwik\API\Request;
 use Piwik\Plugins\Annotations\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesWithAnnotations;
 use FakeAccess;
 use Exception;
@@ -19,7 +19,7 @@ use Exception;
  * @group Integration
  * @group AnnotationsTest
  */
-class AnnotationsTest extends IntegrationTestCase
+class AnnotationsTest extends SystemTestCase
 {
     public static $fixture = null;
 
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
index db49a8852b..a25b369f7e 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
+++ b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\API\Proxy;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
 
 /**
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
  * @group Integration
  * @group ApiGetReportMetadataTest
  */
-class ApiGetReportMetadataTest extends IntegrationTestCase
+class ApiGetReportMetadataTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
index 44da8df449..d9258c9693 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
+++ b/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\InvalidVisits;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\InvalidVisits;
  * @group Integration
  * @group ApiGetReportMetadataYearTest
  */
-class ApiGetReportMetadataYearTest extends IntegrationTestCase
+class ApiGetReportMetadataYearTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 07cef4e5ff..83a580a916 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 use Piwik\Tests\Fixture;
 use Exception;
@@ -23,7 +23,7 @@ use Exception;
  * @group Integration
  * @group ArchiveCronTest
  */
-class ArchiveCronTest extends IntegrationTestCase
+class ArchiveCronTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/ArchiveInvalidationTest.php b/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
index 1d04920a8c..e2a30a688b 100644
--- a/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
+++ b/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\API\Request;
 use Piwik\Config;
 use Piwik\Tests\Fixtures\VisitsTwoWebsitesWithAdditionalVisits;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Exception;
 
 /**
@@ -23,7 +23,7 @@ use Exception;
  * @group Integration
  * @group ArchiveInvalidationTest
  */
-class ArchiveInvalidationTest extends IntegrationTestCase
+class ArchiveInvalidationTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php
index 3d3d04acac..bc7ec439af 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/Integration/ArchiveWebTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Option;
 use Piwik\Http;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 use Piwik\Tests\Fixture;
 use Exception;
@@ -20,7 +20,7 @@ use Exception;
  * @group Integration
  * @group ArchiveWebTest
  */
-class ArchiveWebTest extends IntegrationTestCase
+class ArchiveWebTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php
index 564414e33c..8560caf468 100644
--- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php
+++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\API\Request;
 use Piwik\Date;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
 use Piwik\Tests\Fixture;
 
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixture;
  * @group AutoSuggestAPITest
  * @group Integration
  */
-class AutoSuggestAPITest extends IntegrationTestCase
+class AutoSuggestAPITest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 8e68ab6610..57b30cfe1b 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SqlDump;
 use Piwik\Tests\Fixture;
 
@@ -20,7 +20,7 @@ use Piwik\Tests\Fixture;
  * @group BackwardsCompatibility1XTest
  * @group Integration
  */
-class BackwardsCompatibility1XTest extends IntegrationTestCase
+class BackwardsCompatibility1XTest extends SystemTestCase
 {
     const FIXTURE_LOCATION = '/tests/resources/piwik-1.13-dump.sql';
 
diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
index b0aa0731a2..0bb351a280 100755
--- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Config;
 use Piwik\Plugins\Actions\ArchivingHelper;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
@@ -21,7 +21,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
  * @group Integration
  * @group BlobReportLimitingTest
  */
-class BlobReportLimitingTest extends IntegrationTestCase
+class BlobReportLimitingTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/Core/CliMultiTest.php b/tests/PHPUnit/Integration/Core/CliMultiTest.php
index fc337957f2..6ae07f2318 100644
--- a/tests/PHPUnit/Integration/Core/CliMultiTest.php
+++ b/tests/PHPUnit/Integration/Core/CliMultiTest.php
@@ -8,7 +8,7 @@
 
 use Piwik\CliMulti;
 use Piwik\Version;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixture;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixture;
  *
  * @group Core
  */
-class Core_CliMultiTest extends IntegrationTestCase
+class Core_CliMultiTest extends SystemTestCase
 {
     /**
      * @var \Piwik\CliMulti
diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
index 41446db7ee..ec0fd83d0a 100644
--- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
+++ b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
@@ -416,7 +416,7 @@ class Core_Plugin_SettingsTest extends DatabaseTestCase
 
     public function test_getSettingsForCurrentUser_shouldReturnAllSettingsIfEnoughPermissionsAndSortThemBySettingOrder()
     {
-        if(\Piwik\Tests\IntegrationTestCase::isPhpVersion53()) {
+        if(\Piwik\Tests\SystemTestCase::isPhpVersion53()) {
             $this->markTestSkipped('does not pass on PHP 5.3.3');
         }
         $this->setSuperUser();
diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/Integration/CsvExportTest.php
index 371875fa0b..ef0f839623 100755
--- a/tests/PHPUnit/Integration/CsvExportTest.php
+++ b/tests/PHPUnit/Integration/CsvExportTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * @group CsvExportTest
  * @group Integration
  */
-class CsvExportTest extends IntegrationTestCase
+class CsvExportTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/CustomEventsTest.php b/tests/PHPUnit/Integration/CustomEventsTest.php
index 542e0b852b..75d9bca3c6 100644
--- a/tests/PHPUnit/Integration/CustomEventsTest.php
+++ b/tests/PHPUnit/Integration/CustomEventsTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
  * @group CustomEventsTest
  * @group Integration
  */
-class CustomEventsTest extends IntegrationTestCase
+class CustomEventsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
index cd0fe79f73..fb9837228e 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
 use Piwik\Piwik;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems;
 
 /**
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems;
  * @group EcommerceOrderWithItemsTest
  * @group Integration
  */
-class EcommerceOrderWithItemsTest extends IntegrationTestCase
+class EcommerceOrderWithItemsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/Integration/FlattenReportsTest.php
index 389f3c0e7b..794431cdb5 100644
--- a/tests/PHPUnit/Integration/FlattenReportsTest.php
+++ b/tests/PHPUnit/Integration/FlattenReportsTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars;
  * @group FlattenReportsTest
  * @group Integration
  */
-class FlattenReportsTest extends IntegrationTestCase
+class FlattenReportsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
index a08750d128..7a48626565 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 
 /**
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\ManySitesImportedLogs;
  * @group ImportLogsTest
  * @group Integration
  */
-class ImportLogsTest extends IntegrationTestCase
+class ImportLogsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php
index 5435809fff..a1ef597384 100644
--- a/tests/PHPUnit/Integration/LabelFilterTest.php
+++ b/tests/PHPUnit/Integration/LabelFilterTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitSeveralPageViews;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\OneVisitSeveralPageViews;
  * @group LabelFilterTest
  * @group Integration
  */
-class LabelFilterTest extends IntegrationTestCase
+class LabelFilterTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
index c7f3d9ca00..cb02522740 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
 use Piwik\Date;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
 
 /**
@@ -23,7 +23,7 @@ use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
  * @group ManyVisitorsOneWebsiteTest
  * @group Integration
  */
-class ManyVisitorsOneWebsiteTest extends IntegrationTestCase
+class ManyVisitorsOneWebsiteTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
index 67289069b3..f97feac378 100644
--- a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
+++ b/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
@@ -11,13 +11,13 @@ use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Tests\Fixture;
 use Piwik\Tests\Fixtures\ThreeSitesWithSharedVisitors;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group Integration
  * @group MultipleSitesArchivingTest
  */
-class MultipleSitesArchivingTest extends IntegrationTestCase
+class MultipleSitesArchivingTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php
index 19a09a45f9..01b70af1eb 100755
--- a/tests/PHPUnit/Integration/NoVisitTest.php
+++ b/tests/PHPUnit/Integration/NoVisitTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\InvalidVisits;
 
 /**
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\InvalidVisits;
  * @group NoVisitTest
  * @group Integration
  */
-class NoVisitTest extends IntegrationTestCase
+class NoVisitTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php
index cb9153a0ba..bdc72869be 100755
--- a/tests/PHPUnit/Integration/NonUnicodeTest.php
+++ b/tests/PHPUnit/Integration/NonUnicodeTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles;
  * @group NonUnicodeTest
  * @group Integration
  */
-class NonUnicodeTest extends IntegrationTestCase
+class NonUnicodeTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
index 62b94edcea..b16d831945 100644
--- a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsWithLongUrls;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\SomeVisitsWithLongUrls;
  * @group OneVisitorLongUrlsTruncatedTest
  * @group Integration
  */
-class OneVisitorLongUrlsTruncatedTest extends IntegrationTestCase
+class OneVisitorLongUrlsTruncatedTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
index c2d8ba430b..df214dad79 100755
--- a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot;
 
 /**
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot;
  * @group Integration
  * @group OneVisitorNoKeywordSpecifiedTest
  */
-class OneVisitorNoKeywordSpecifiedTest extends IntegrationTestCase
+class OneVisitorNoKeywordSpecifiedTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 831bab64f3..2d2d1e1105 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Piwik;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
 
 /**
@@ -20,7 +20,7 @@ use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
  * @group OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest
  * @group Integration
  */
-class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends IntegrationTestCase
+class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below test definition
 
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
index e877166a25..5b60487d95 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
 
 /**
@@ -20,7 +20,7 @@ use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
  * @group OneVisitorOneWebsiteSeveralDaysDateRangeTest
  * @group Integration
  */
-class OneVisitorOneWebsiteSeveralDaysDateRangeTest extends IntegrationTestCase
+class OneVisitorOneWebsiteSeveralDaysDateRangeTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php b/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
index 675f4cef06..22b31b91f0 100644
--- a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
@@ -7,14 +7,14 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitOverSeveralDaysImportedLogs;
 
 /**
  * @group Integration
  * @group OneVisitorSeveralDaysImportedInRandomOrderTest
  */
-class OneVisitorSeveralDaysImportedInRandomOrderTest extends IntegrationTestCase
+class OneVisitorSeveralDaysImportedInRandomOrderTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
index d8b211e6f9..63a49436c9 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\API\Proxy;
 use Piwik\Archive;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 use Exception;
 
@@ -26,7 +26,7 @@ use Exception;
  * @group Integration
  * @group OneVisitorTwoVisitsTest
  */
-class OneVisitorTwoVisitsTest extends IntegrationTestCase
+class OneVisitorTwoVisitsTest extends SystemTestCase
 {
     /**
      * @var Test_Piwik_Fixture_OneVisitorTwoVisits
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
index a266118018..1245aacd2d 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
  * @group OneVisitorTwoVisitsWithCookieSupportTest
  * @group Integration
  */
-class OneVisitorTwoVisitsWithCookieSupportTest extends IntegrationTestCase
+class OneVisitorTwoVisitsWithCookieSupportTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class
 
diff --git a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
index c5847cdbfc..0ec4358d6f 100755
--- a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
+++ b/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * @group PeriodIsRangeDateIsLastNMetadataAndNormalAPITest
  * @group Integration
  */
-class PeriodIsRangeDateIsLastNMetadataAndNormalAPITest extends IntegrationTestCase
+class PeriodIsRangeDateIsLastNMetadataAndNormalAPITest extends SystemTestCase
 {
     public static $fixture = null;
 
diff --git a/tests/PHPUnit/Integration/PivotByQueryParamTest.php b/tests/PHPUnit/Integration/PivotByQueryParamTest.php
index 7e579f4b5e..b0d14325cf 100644
--- a/tests/PHPUnit/Integration/PivotByQueryParamTest.php
+++ b/tests/PHPUnit/Integration/PivotByQueryParamTest.php
@@ -10,13 +10,13 @@ namespace Piwik\Tests\Integration;
 use Piwik\Config;
 use Piwik\Date;
 use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 
 /**
  * @group Integration
  * @group PivotByQueryParamTest
  */
-class PivotByQueryParamTest extends IntegrationTestCase
+class PivotByQueryParamTest extends SystemTestCase
 {
     /**
      * @var ManyVisitsWithMockLocationProvider
diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/Integration/PrivacyManagerTest.php
index c229f08d8c..fd291aaa92 100644
--- a/tests/PHPUnit/Integration/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/PrivacyManagerTest.php
@@ -25,7 +25,7 @@ use Piwik\Plugins\VisitorInterest\API as APIVisitorInterest;
 use Piwik\Site;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\GoalManager;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixture;
 
 require_once 'PrivacyManager/PrivacyManager.php';
@@ -34,7 +34,7 @@ require_once 'PrivacyManager/PrivacyManager.php';
  * @group PrivacyManagerTest
  * @group Integration
  */
-class PrivacyManagerTest extends IntegrationTestCase
+class PrivacyManagerTest extends SystemTestCase
 {
     // constants used in checking whether numeric tables are populated correctly.
     // 'done' entries exist for every period, even if there's no metric data, so we need the
diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/Integration/PurgeDataTest.php
index 29d7ccc084..2da485cb4a 100755
--- a/tests/PHPUnit/Integration/PurgeDataTest.php
+++ b/tests/PHPUnit/Integration/PurgeDataTest.php
@@ -12,7 +12,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 use Piwik\API\Request;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\Plugins\PrivacyManager\ReportsPurger;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 
 /**
@@ -21,7 +21,7 @@ use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
  * @group Integration
  * @group PurgeDataTest
  */
-class PurgeDataTest extends IntegrationTestCase
+class PurgeDataTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php
index 2af1f5fccd..f7e6564587 100755
--- a/tests/PHPUnit/Integration/RowEvolutionTest.php
+++ b/tests/PHPUnit/Integration/RowEvolutionTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferr
  * @group RowEvolutionTest
  * @group Integration
  */
-class RowEvolutionTest extends IntegrationTestCase
+class RowEvolutionTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php
index 0ae3c73fd2..5c71152ead 100755
--- a/tests/PHPUnit/Integration/SiteSearchTest.php
+++ b/tests/PHPUnit/Integration/SiteSearchTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch;
  * @group SiteSearchTest
  * @group Integration
  */
-class SiteSearchTest extends IntegrationTestCase
+class SiteSearchTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TimezonesTest.php b/tests/PHPUnit/Integration/TimezonesTest.php
index 1603c23cb4..e458916a0f 100644
--- a/tests/PHPUnit/Integration/TimezonesTest.php
+++ b/tests/PHPUnit/Integration/TimezonesTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsInDifferentTimezones;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\VisitsInDifferentTimezones;
  * @group TimezonesTest
  * @group Integration
  */
-class TimezonesTest extends IntegrationTestCase
+class TimezonesTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
index 3f45410510..1e29969279 100755
--- a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
+++ b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics;
  * @group TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest
  * @group Integration
  */
-class TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest extends IntegrationTestCase
+class TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
index cac31449c2..178f91c84b 100755
--- a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
+++ b/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Plugins\Goals\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsAllConversions;
 
 /**
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\SomeVisitsAllConversions;
  * @group TrackGoalsAllowMultipleConversionsPerVisitTest
  * @group Integration
  */
-class TrackGoalsAllowMultipleConversionsPerVisitTest extends IntegrationTestCase
+class TrackGoalsAllowMultipleConversionsPerVisitTest extends SystemTestCase
 {
     public static $fixture = null;
 
diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
index 58f1eecde7..e6873cfa45 100644
--- a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
+++ b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
  * @group TrackerWindowLookBackTest
  * @group Integration
  */
-class TrackerWindowLookBackTest extends IntegrationTestCase
+class TrackerWindowLookBackTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TransitionsTest.php b/tests/PHPUnit/Integration/TransitionsTest.php
index 613e66dd45..8bb4dd7d8d 100644
--- a/tests/PHPUnit/Integration/TransitionsTest.php
+++ b/tests/PHPUnit/Integration/TransitionsTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions;
  * @group TransitionsTest
  * @group Integration
  */
-class TransitionsTest extends IntegrationTestCase
+class TransitionsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
index a5f1aa5f5a..421697ada6 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
  * @group TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest
  * @group Integration
  */
-class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends IntegrationTestCase
+class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 9557cba704..7d1d3379b2 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Plugins\Goals\Archiver;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
 require_once 'Goals/Goals.php';
@@ -20,7 +20,7 @@ require_once 'Goals/Goals.php';
  * @group TwoVisitorsTwoWebsitesDifferentDaysConversionsTest
  * @group Integration
  */
-class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends IntegrationTestCase
+class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index f4c14d3569..8458c53269 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
 /**
@@ -22,7 +22,7 @@ use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
  * @group TwoVisitorsTwoWebsitesDifferentDaysTest
  * @group Integration
  */
-class TwoVisitorsTwoWebsitesDifferentDaysTest extends IntegrationTestCase
+class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
index 1f31497a53..5292c3decb 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * @group Integration
  * @group TwoVisitsWithCustomVariablesSegmentContainsTest
  */
-class TwoVisitsWithCustomVariablesSegmentContainsTest extends IntegrationTestCase
+class TwoVisitsWithCustomVariablesSegmentContainsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
index d800deca65..6c63bb9359 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
@@ -7,14 +7,14 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * @group Integration
  * @group TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest
  */
-class TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest extends IntegrationTestCase
+class TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index 1c0af3449a..35b5cba9fd 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Plugins\API\API;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 use Piwik\Tests\Fixture;
 
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixture;
  * @group Integration
  * @group TwoVisitsWithCustomVariablesSegmentMatchNONETest
  */
-class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends IntegrationTestCase
+class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index d7582bdcc6..159d67bbc7 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -9,7 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Common;
 use Piwik\Db;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
@@ -18,7 +18,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * @group Integration
  * @group TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest
  */
-class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends IntegrationTestCase
+class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
index a9fafeddb8..e19a87f39b 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
@@ -7,7 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
  * @group TwoVisitsWithCustomVariablesTest
  * @group Integration
  */
-class TwoVisitsWithCustomVariablesTest extends IntegrationTestCase
+class TwoVisitsWithCustomVariablesTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php
index 867fdcad60..c5373dc220 100644
--- a/tests/PHPUnit/Integration/UrlNormalizationTest.php
+++ b/tests/PHPUnit/Integration/UrlNormalizationTest.php
@@ -10,7 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Tracker\Action;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls;
 
 /**
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls;
  * @group Integration
  * @group UrlNormalizationTest
  */
-class UrlNormalizationTest extends IntegrationTestCase
+class UrlNormalizationTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php b/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
index d572544b13..b33bff7d53 100644
--- a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
+++ b/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\API\Proxy;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId;
 
 /**
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId;
  * @group UserIdAndVisitorIdTest
  * @group Integration
  */
-class UserIdAndVisitorIdTest extends IntegrationTestCase
+class UserIdAndVisitorIdTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
index 32c085ceff..51a73339c2 100644
--- a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
+++ b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\API\Request;
-use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesVisitsInPast;
 use Exception;
 
@@ -20,7 +20,7 @@ use Exception;
  * @group Integration
  * @group VisitsInPastInvalidateOldReportsTest
  */
-class VisitsInPastInvalidateOldReportsTest extends IntegrationTestCase
+class VisitsInPastInvalidateOldReportsTest extends SystemTestCase
 {
     public static $fixture = null; // initialized below class definition
 
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/SystemTestCase.php
index d5d78128a4..0a804ae6e6 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/SystemTestCase.php
@@ -34,7 +34,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
  * Provides helpers to track data and then call API get* methods to check outputs automatically.
  *
  */
-abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
+abstract class SystemTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * Identifies the last language used in an API/Controller call.
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 2fd701a0e8..82681fe8b3 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -35,8 +35,8 @@ 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/IntegrationTestCase.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/DatabaseTestCase.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';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockPiwikOption.php';
diff --git a/tests/README.md b/tests/README.md
index 09774160e6..865606c12e 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -105,7 +105,7 @@ Otherwise, if you didn't expect to modify the API outputs, it might be that your
 As part of our integration 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 `IntegrationTestCase::canImagesBeIncludedInScheduledReports()`
+The characteristics of the integration server are described in `SystemTestCase::canImagesBeIncludedInScheduledReports()`
 
 ## JavaScript Tests