diff --git a/tests/PHPUnit/Integration/Core/AccessTest.php b/tests/PHPUnit/Integration/Core/AccessTest.php
index e02bda9d57f9a23ec8c6023c552a1d6be59404f0..4b02d495bd8a827b5c5ec1f03773c7b05387ffd7 100644
--- a/tests/PHPUnit/Integration/Core/AccessTest.php
+++ b/tests/PHPUnit/Integration/Core/AccessTest.php
@@ -8,7 +8,7 @@
 use Piwik\Access;
 use Piwik\AuthResult;
 
-class AccessTest extends DatabaseTestCase
+class Core_AccessTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
index 12c6c59b7e82ef2054dfd4790699461af7663896..39bc7321d903f9e960578036675d608c95cfd599 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
@@ -22,7 +22,7 @@ use Piwik\Segment;
 use Piwik\SettingsServer;
 use Piwik\Site;
 
-class ArchiveProcessorTest extends ArchiveProcessor\Loader {
+class Core_ArchiveProcessorTest extends ArchiveProcessor\Loader {
 
     public function getParams()
     {
@@ -77,7 +77,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
      * @param string $periodLabel
      * @param string $dateLabel
      * @param string $siteTimezone
-     * @return  \ArchiveProcessorTest
+     * @return  \Core_ArchiveProcessorTest
      */
     private function _createArchiveProcessor($periodLabel, $dateLabel, $siteTimezone)
     {
@@ -87,7 +87,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
         $segment = new Segment('', $site->getId());
 
         $params = new ArchiveProcessor\Parameters($site, $period, $segment);
-        return new \ArchiveProcessorTest($params);
+        return new \Core_ArchiveProcessorTest($params);
     }
 
     /**
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
index 484a2269baa3c76aab8f6d720bc8933b791a21b9..ffd227ccfe833fde4f63cbbe85f08bebe2c29537 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -15,7 +15,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
 use Piwik\Log;
 use Piwik\Plugins\TestPlugin\TestLoggingUtility;
 
-class LogTest extends DatabaseTestCase
+class Core_LogTest extends DatabaseTestCase
 {
     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 15db913bc0e1bfa64574793872c6c833c5f77db3..8ace6f24875694db64d0e392c38b25eec6ed033c 100644
--- a/tests/PHPUnit/Integration/Core/OptionTest.php
+++ b/tests/PHPUnit/Integration/Core/OptionTest.php
@@ -11,7 +11,7 @@ use Piwik\Option;
 
 require_once "Option.php";
 
-class OptionTest extends DatabaseTestCase
+class Core_OptionTest extends DatabaseTestCase
 {
     /**
      * @group Core
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index 98690d1c7250803a43588b551486f20d2fe2bdbc..b0df34b09dc944b6a08f01636d9ef023800ab4ed 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -12,7 +12,7 @@ use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Translate;
 
-class PiwikTest extends DatabaseTestCase
+class Core_PiwikTest extends DatabaseTestCase
 {
     /**
      * Tests the generated JS code
diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
index e56801ef2792858019edac8d23a7555d5f07b845..009ba40fca51937961a383731abc55d7fd837ef3 100644
--- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
+++ b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
@@ -10,7 +10,7 @@ use Piwik\Access;
 use Piwik\Plugin\Settings as PluginSettings;
 use Piwik\Settings\Setting;
 
-class TestablePluginSettings extends \Piwik\Plugins\ExampleSettingsPlugin\Settings {
+class Core_Plugin_SettingsTest extends \Piwik\Plugins\ExampleSettingsPlugin\Settings {
 
     public function init()
     {
@@ -31,7 +31,7 @@ class TestablePluginSettings extends \Piwik\Plugins\ExampleSettingsPlugin\Settin
 class SettingsTest extends DatabaseTestCase
 {
     /**
-     * @var TestablePluginSettings
+     * @var Core_Plugin_SettingsTest
      */
     private $settings;
 
@@ -76,21 +76,21 @@ class SettingsTest extends DatabaseTestCase
     public function test_addSetting_shouldAssignDefaultType_IfFieldIsGivenButNoType()
     {
         $setting = $this->buildUserSetting('myname', 'mytitle');
-        $setting->uiControlType = TestablePluginSettings::CONTROL_MULTI_SELECT;
+        $setting->uiControlType = Core_Plugin_SettingsTest::CONTROL_MULTI_SELECT;
 
         $this->settings->addSetting($setting);
 
-        $this->assertEquals(TestablePluginSettings::TYPE_ARRAY, $setting->type);
+        $this->assertEquals(Core_Plugin_SettingsTest::TYPE_ARRAY, $setting->type);
     }
 
     public function test_addSetting_shouldAssignDefaultField_IfTypeIsGivenButNoField()
     {
         $setting = $this->buildUserSetting('myname', 'mytitle');
-        $setting->type = TestablePluginSettings::TYPE_ARRAY;
+        $setting->type = Core_Plugin_SettingsTest::TYPE_ARRAY;
 
         $this->settings->addSetting($setting);
 
-        $this->assertEquals(TestablePluginSettings::CONTROL_MULTI_SELECT, $setting->uiControlType);
+        $this->assertEquals(Core_Plugin_SettingsTest::CONTROL_MULTI_SELECT, $setting->uiControlType);
     }
 
     public function test_addSetting_shouldAddAValidator_IfFieldOptionsAreGiven()
@@ -650,6 +650,6 @@ class SettingsTest extends DatabaseTestCase
 
     private function createSettingsInstance()
     {
-        return new TestablePluginSettings('ExampleSettingsPlugin');
+        return new Core_Plugin_SettingsTest('ExampleSettingsPlugin');
     }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/Core/SqlTest.php
index e1eb17229cdfd46f891a3b2693ed60fbb2e6a34c..8aab87022b445d6f5edf31a17bb9b217144e05f6 100755
--- a/tests/PHPUnit/Integration/Core/SqlTest.php
+++ b/tests/PHPUnit/Integration/Core/SqlTest.php
@@ -7,7 +7,7 @@ use Piwik\Db;
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-class SqlTest extends DatabaseTestCase
+class Core_SqlTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
index 9c03119c662683eb78287c6737bdd3b0c47e1b6d..5e86530986c7153380ee9fa5deec2d962652137c 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
@@ -13,7 +13,7 @@ use Piwik\Translate;
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-class Tracker_ActionTest extends DatabaseTestCase
+class Core_Tracker_ActionTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
index f95fabc133d6cdb5ed41c808e253301472c42de4..ff084a449471e4c3fa08b74d9912b690128a0aa1 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
@@ -11,7 +11,7 @@ use Piwik\Plugins\SitesManager\API;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\VisitExcluded;
 
-class Tracker_VisitTest extends DatabaseTestCase
+class Core_Tracker_VisitTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/Core/UpdaterTest.php
index e16af91b4dbd80ebfba55a5986288714cee0def9..a00d6c4086053a27ca57a9e435e7e5b28414415b 100644
--- a/tests/PHPUnit/Integration/Core/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/Core/UpdaterTest.php
@@ -7,7 +7,7 @@
  */
 use Piwik\Updater;
 
-class UpdaterTest extends DatabaseTestCase
+class Core_UpdaterTest extends DatabaseTestCase
 {
     /**
      * @group Core
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
index 4c10917744c5d50db40dbe13ea4d3b0f010b58cf..72fa57830aef0e1fd55e904c0a3119b52d594d19 100644
--- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
@@ -10,7 +10,7 @@ use Piwik\Access;
 use Piwik\Plugins\Goals\API;
 use Piwik\WidgetsList;
 
-class WidgetsListTest extends DatabaseTestCase
+class Core_WidgetsListTest extends DatabaseTestCase
 {
     /**
      * @group Core
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index d45419e5de8b90026bfdd443e00d8c74eb85e95e..25f90720975d44f87f8fecb2b5a645bf90993643 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\UsersManager\API;
 
 require_once 'Login/Auth.php';
 
-class LoginTest extends DatabaseTestCase
+class Plugins_LoginTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
index 01a1257368b1c5f11cd6dbb3f0b8ef961d6786c8..d08081781c875e81d13f4e3fb83a77b306283bbd 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -13,7 +13,7 @@ use Piwik\Plugins\MobileMessaging\SMSProvider;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
-class MobileMessagingTest extends DatabaseTestCase
+class Plugins_MobileMessagingTest extends DatabaseTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
index 7df1b0510406f69e5f08c57537cd304560c3f4bc..72f9f970b539557de593f788d84a83d7fe829fbb 100644
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
@@ -10,7 +10,7 @@ use Piwik\Access;
 use Piwik\Plugins\MultiSites\API as APIMultiSites;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
-class MultiSitesTest extends DatabaseTestCase
+class Plugins_MultiSitesTest extends DatabaseTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 8c5ffc79eac64963c608ee41714348fa2a69f6f2..9787f73d0019fa8b70a818fc47b5642d510c31ec 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -19,7 +19,7 @@ use Piwik\Site;
 
 require_once 'ScheduledReports/ScheduledReports.php';
 
-class ScheduledReportsTest extends DatabaseTestCase
+class Plugins_ScheduledReportsTest extends DatabaseTestCase
 {
     private $idSite = 1;
 
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
index ec2038f2f755427fd313642b5d05d977c1f13027..52a0a3a41119e77f879de144447578b71f38324e 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
@@ -11,7 +11,7 @@ use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
-class SegmentEditorTest extends DatabaseTestCase
+class Plugins_SegmentEditorTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
index 8aa8e85992f3bf26e7f798fcd3dfadfaad894f28..aa2eb89ef2249e7be99940d007f443af0f2645bd 100644
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
@@ -10,7 +10,7 @@ use Piwik\Plugins\SitesManager\API;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Site;
 
-class SitesManagerTest extends DatabaseTestCase
+class Plugins_SitesManagerTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
index d1ed6313281cd3b535ce921ded2e9f88d542b3e0..08da4b001b294b830d8694a540c3600bf242a9b6 100644
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
@@ -10,7 +10,7 @@ use Piwik\Plugins\UsersManager\API;
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-class UsersManagerTest extends DatabaseTestCase
+class Plugins_UsersManagerTest extends DatabaseTestCase
 {
     public function setUp()
     {