From 8cca15cec31e68adb8aa43f688471beaf3b09128 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Wed, 9 Jul 2014 21:52:45 -0700
Subject: [PATCH] Refs #5800, add namespaces to all Fixture classes.

---
 .../Fixtures/VisitWithManyCustomVariables.php  |  3 ++-
 .../fixtures/SimpleFixtureTrackFewVisits.php   |  7 +++----
 .../SomeVisitsDifferentPathsOnTwoDays.php      |  6 +++---
 tests/PHPUnit/Fixture.php                      | 15 ++++++++-------
 .../Fixtures/FewVisitsWithSetVisitorId.php     |  8 ++++++--
 tests/PHPUnit/Fixtures/InvalidVisits.php       |  7 +++++--
 .../PHPUnit/Fixtures/ManySitesImportedLogs.php | 13 ++++++++-----
 .../ManySitesImportedLogsWithXssAttempts.php   |  7 +++++--
 tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php |  9 +++++----
 .../ManyVisitsWithMockLocationProvider.php     | 11 ++++++-----
 ...yVisitsWithSubDirReferrersAndCustomVars.php |  8 +++++---
 tests/PHPUnit/Fixtures/OmniFixture.php         | 18 ++++++++++--------
 .../Fixtures/OneVisitSeveralPageViews.php      |  5 ++++-
 .../OneVisitWithAbnormalPageviewUrls.php       |  7 +++++--
 tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php |  7 +++++--
 .../Fixtures/SomeVisitsAllConversions.php      |  7 +++++--
 ...tsCustomVariablesCampaignsNotHeuristics.php |  8 ++++++--
 .../SomeVisitsManyPageviewsWithTransitions.php |  7 +++++--
 .../Fixtures/SomeVisitsWithLongUrls.php        |  7 +++++--
 .../SomeVisitsWithNonUnicodePageTitles.php     |  7 +++++--
 tests/PHPUnit/Fixtures/SqlDump.php             |  5 ++++-
 .../PHPUnit/Fixtures/ThreeGoalsOnePageview.php |  7 +++++--
 .../ThreeSitesWithManyVisitsWithSiteSearch.php |  9 +++++----
 .../TwoSitesEcommerceOrderWithItems.php        | 11 +++++------
 ...verSeveralDaysWithSearchEngineReferrers.php |  7 +++++--
 .../TwoSitesTwoVisitorsDifferentDays.php       |  9 +++++----
 .../PHPUnit/Fixtures/TwoSitesVisitsInPast.php  |  7 +++++--
 .../Fixtures/TwoSitesWithAnnotations.php       |  8 ++++++--
 .../Fixtures/TwoVisitsNoKeywordWithBot.php     |  8 +++++---
 .../Fixtures/TwoVisitsWithCustomEvents.php     |  9 ++++++---
 .../Fixtures/TwoVisitsWithCustomVariables.php  |  7 +++++--
 tests/PHPUnit/Fixtures/UITestFixture.php       |  7 ++++---
 .../VisitOverSeveralDaysImportedLogs.php       |  8 +++++---
 .../Fixtures/VisitsInDifferentTimezones.php    |  5 ++++-
 .../PHPUnit/Fixtures/VisitsOverSeveralDays.php |  7 +++++--
 tests/PHPUnit/Integration/AnnotationsTest.php  |  3 ++-
 .../Integration/ApiGetReportMetadataTest.php   |  3 ++-
 .../ApiGetReportMetadataYearTest.php           |  3 ++-
 tests/PHPUnit/Integration/ArchiveCronTest.php  | 10 ++++++----
 tests/PHPUnit/Integration/ArchiveWebTest.php   |  8 +++++---
 .../PHPUnit/Integration/AutoSuggestAPITest.php |  6 ++++--
 .../BackwardsCompatibility1XTest.php           | 12 +++++++-----
 .../Integration/BlobReportLimitingTest.php     |  3 ++-
 tests/PHPUnit/Integration/CsvExportTest.php    |  3 ++-
 tests/PHPUnit/Integration/CustomEventsTest.php |  3 ++-
 .../EcommerceOrderWithItemsTest.php            |  3 ++-
 .../PHPUnit/Integration/FlattenReportsTest.php |  3 ++-
 tests/PHPUnit/Integration/ImportLogsTest.php   |  3 ++-
 tests/PHPUnit/Integration/LabelFilterTest.php  |  3 ++-
 .../Integration/ManyVisitorsOneWebsiteTest.php |  3 ++-
 tests/PHPUnit/Integration/NoVisitTest.php      |  3 ++-
 tests/PHPUnit/Integration/NonUnicodeTest.php   |  3 ++-
 .../OneVisitorLongUrlsTruncatedTest.php        |  3 ++-
 .../OneVisitorNoKeywordSpecifiedTest.php       |  3 ++-
 ...eSeveralDaysDateRangeArchivingTestsTest.php |  3 ++-
 ...sitorOneWebsiteSeveralDaysDateRangeTest.php |  3 ++-
 ...torSeveralDaysImportedInRandomOrderTest.php |  3 ++-
 .../Integration/OneVisitorTwoVisitsTest.php    |  3 ++-
 ...neVisitorTwoVisitsWithCookieSupportTest.php |  3 ++-
 ...angeDateIsLastNMetadataAndNormalAPITest.php |  3 ++-
 .../PHPUnit/Integration/PrivacyManagerTest.php |  9 +++++----
 tests/PHPUnit/Integration/PurgeDataTest.php    |  3 ++-
 tests/PHPUnit/Integration/RowEvolutionTest.php |  3 ++-
 tests/PHPUnit/Integration/SiteSearchTest.php   |  3 ++-
 tests/PHPUnit/Integration/TimezonesTest.php    |  3 ++-
 ...aignsForceUsingVisitIdNotHeuristicsTest.php |  3 ++-
 ...alsAllowMultipleConversionsPerVisitTest.php |  3 ++-
 .../Integration/TrackerWindowLookBackTest.php  |  3 ++-
 .../TrackingAPISetVisitorIdTest.php            |  3 ++-
 tests/PHPUnit/Integration/TransitionsTest.php  |  3 ++-
 ...sitesDifferentDaysArchivingDisabledTest.php |  4 ++--
 ...TwoWebsitesDifferentDaysConversionsTest.php |  4 ++--
 ...TwoVisitorsTwoWebsitesDifferentDaysTest.php |  3 ++-
 ...sWithCustomVariablesSegmentContainsTest.php |  4 ++--
 ...mVariablesSegmentMatchALLNoGoalDataTest.php |  3 ++-
 ...WithCustomVariablesSegmentMatchNONETest.php |  7 ++++---
 ...tomVariablesSegmentMatchVisitorTypeTest.php |  3 ++-
 .../TwoVisitsWithCustomVariablesTest.php       |  4 ++--
 .../Integration/UrlNormalizationTest.php       |  4 ++--
 .../VisitsInPastInvalidateOldReportsTest.php   |  3 ++-
 tests/PHPUnit/IntegrationTestCase.php          |  3 +--
 tests/PHPUnit/UI                               |  2 +-
 tests/PHPUnit/bootstrap.php                    |  2 +-
 83 files changed, 292 insertions(+), 170 deletions(-)

diff --git a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php
index 11ca605297..8060eb25a7 100644
--- a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php
+++ b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php
@@ -9,11 +9,12 @@ namespace Piwik\Plugins\CustomVariables\tests\Fixtures;
 
 use Piwik\Plugins\CustomVariables\Model;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site with two goals and tracks two visits with custom variables.
  */
-class VisitWithManyCustomVariables extends \Fixture
+class VisitWithManyCustomVariables extends Fixture
 {
     public $dateTime = '2010-01-03 11:22:33';
     public $idSite = 1;
diff --git a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php b/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php
index 40aff52ad8..f0515abfb1 100644
--- a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php
+++ b/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php
@@ -8,13 +8,14 @@
 namespace Piwik\Plugins\ExamplePlugin\tests\fixtures;
 
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Generates tracker testing data for our SimpleIntegrationTest
  *
  * This Simple fixture adds one website and tracks one visit with couple pageviews and an ecommerce conversion
  */
-class SimpleFixtureTrackFewVisits extends \Fixture
+class SimpleFixtureTrackFewVisits extends Fixture
 {
     public $dateTime = '2013-01-23 01:23:45';
     public $idSite = 1;
@@ -75,6 +76,4 @@ class SimpleFixtureTrackFewVisits extends \Fixture
         self::checkResponse($t->doTrackEcommerceCartUpdate($grandTotal = 33 * 77));
 
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
index a665a06d96..c5314d3aa3 100644
--- a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
+++ b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
@@ -9,12 +9,13 @@
 namespace Piwik\Plugins\Insights\tests\Fixtures;
 
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one website and tracks several visits from one visitor on
  * different days that span about a month apart.
  */
-class SomeVisitsDifferentPathsOnTwoDays extends \Test_Piwik_BaseFixture
+class SomeVisitsDifferentPathsOnTwoDays extends Fixture
 {
     public $idSite = 1;
     public $date1  = '2010-12-14';
@@ -75,6 +76,5 @@ class SomeVisitsDifferentPathsOnTwoDays extends \Test_Piwik_BaseFixture
                 $numPageViews++;
             }
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index 059619c483..41bd85ddf1 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -5,6 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests;
+
 use Piwik\Access;
 use Piwik\Common;
 use Piwik\Config;
@@ -31,7 +33,11 @@ use Piwik\Translate;
 use Piwik\Url;
 use Piwik\Plugins\CoreUpdater\CoreUpdater;
 use Piwik\Updater;
-use Piwik\Tests\IntegrationTestCase;
+use PHPUnit_Framework_Assert;
+use Piwik_TestingEnvironment;
+use FakeAccess;
+use PiwikTracker;
+use Piwik_LocalTracker;
 
 /**
  * Base type for all integration test fixtures. Integration test fixtures
@@ -805,13 +811,8 @@ class Fixture extends PHPUnit_Framework_Assert
     }
 }
 
-// TODO: remove when other plugins don't use BaseFixture
-class Test_Piwik_BaseFixture extends Fixture
-{
-}
-
 // needed by tests that use stored segments w/ the proxy index.php
-class Test_Access_OverrideLogin extends Access
+class OverrideLogin extends Access
 {
     public function getLogin()
     {
diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php
index ab5e02a7ed..e65ae09d8d 100644
--- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php
+++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php
@@ -5,13 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Tracker\Visit;
+use Piwik\Tests\Fixture;
+use PiwikTracker;
 
 /**
  * Adds one site and tracks a couple visits using a custom visitor ID.
  */
-class Test_Piwik_Fixture_FewVisitsWithSetVisitorId extends Fixture
+class FewVisitsWithSetVisitorId extends Fixture
 {
     public $idSite = 1;
     public $dateTime = '2010-03-06 11:22:33';
@@ -87,4 +91,4 @@ class Test_Piwik_Fixture_FewVisitsWithSetVisitorId extends Fixture
             //OK
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php
index 75015a0766..d6882cf1ec 100644
--- a/tests/PHPUnit/Fixtures/InvalidVisits.php
+++ b/tests/PHPUnit/Fixtures/InvalidVisits.php
@@ -5,14 +5,17 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Http;
 use Piwik\Plugins\SitesManager\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and sends several invalid tracking requests. The result should be
  * one website with no visits.
  */
-class Test_Piwik_Fixture_InvalidVisits extends Fixture
+class InvalidVisits extends Fixture
 {
     public $idSite = 1;
     public $dateTime = '2009-01-04 00:11:42';
@@ -107,4 +110,4 @@ class Test_Piwik_Fixture_InvalidVisits extends Fixture
 
         $t->setAttributionInfo(json_encode(array()));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index a43d12661d..33e13f7999 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -5,16 +5,20 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Access;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider;
+use Piwik\Tests\Fixture;
+use Piwik\Tests\OverrideLogin;
 
 /**
  * Imports visits from several log files using the python log importer.
  */
-class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
+class ManySitesImportedLogs extends Fixture
 {
     public $dateTime = '2012-08-09 11:22:33';
     public $idSite = 1;
@@ -26,7 +30,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
 
     public static function createAccessInstance()
     {
-        Access::setSingletonInstance($access = new Test_Access_OverrideLogin());
+        Access::setSingletonInstance($access = new OverrideLogin());
         \Piwik\Piwik::postEvent('Request.initAuthenticationObject');
     }
 
@@ -47,7 +51,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
     {
         LocationProvider::$providers = null;
         GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
-        Test_Piwik_Fixture_ManyVisitsWithGeoIP::unsetLocationProvider();
+        ManyVisitsWithGeoIP::unsetLocationProvider();
     }
 
     public function setUpWebsitesAndGoals()
@@ -225,5 +229,4 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Fixture
 
         self::executeLogImporter($logFile, $opts);
     }
-
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index 83695ef531..4ed24f8573 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -5,10 +5,13 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Plugins\Annotations\API as APIAnnotations;
 use Piwik\Plugins\Goals\API as APIGoals;
+use Piwik\Tests\Fixture;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php';
 
@@ -16,7 +19,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs
  * Imports visits from several log files using the python log importer &
  * adds goals/sites/etc. attempting to create XSS.
  */
-class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik_Fixture_ManySitesImportedLogs
+class ManySitesImportedLogsWithXssAttempts extends ManySitesImportedLogs
 {
     public $now = null;
 
@@ -117,4 +120,4 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik
         $t->setLongitude(-46.64);
         self::checkResponse($t->doTrackPageView('incredible title!'));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index e938edb86c..505c6e0844 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -5,11 +5,13 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
 
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider;
+use Piwik\Tests\Fixture;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
@@ -17,7 +19,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
  * Adds one new website and tracks 35 visits from 18 visitors with geolocation using
  * free GeoIP databases. The GeoIP databases are downloaded if they do not exist already.
  */
-class Test_Piwik_Fixture_ManyVisitsWithGeoIP extends Fixture
+class ManyVisitsWithGeoIP extends Fixture
 {
     const GEOIP_IMPL_TO_TEST = 'geoip_php';
 
@@ -207,7 +209,7 @@ class Test_Piwik_Fixture_ManyVisitsWithGeoIP extends Fixture
     {
         LocationProvider::$providers = null;
         LocationProvider::setCurrentProvider('mock_provider');
-        MockLocationProvider::$locations = array(
+        \MockLocationProvider::$locations = array(
             self::makeLocation('Stratford-upon-Avon', 'P3', 'gb', 123.456, 21.321), // template location
 
             // same region, different city, same country
@@ -251,5 +253,4 @@ class Test_Piwik_Fixture_ManyVisitsWithGeoIP extends Fixture
             // ignore error
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
index ebbaf380f3..b53d88d25f 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
@@ -5,16 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
 
 use Piwik\Date;
 use Piwik\Plugins\UserCountry\LocationProvider;
+use Piwik\Tests\Fixture;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
 /**
  * Adds one site and tracks 60 visits (15 visitors, one action per visit).
  */
-class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Fixture
+class ManyVisitsWithMockLocationProvider extends Fixture
 {
     public $idSite = 1;
     public $dateTime = '2010-01-03 01:22:33';
@@ -34,7 +36,7 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Fixture
 
     public function tearDown()
     {
-        Test_Piwik_Fixture_ManyVisitsWithGeoIP::unsetLocationProvider();
+        ManyVisitsWithGeoIP::unsetLocationProvider();
     }
 
     private function setUpWebsitesAndGoals()
@@ -208,7 +210,7 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Fixture
     private function setMockLocationProvider()
     {
         LocationProvider::setCurrentProvider('mock_provider');
-        MockLocationProvider::$locations = array(
+        \MockLocationProvider::$locations = array(
             self::makeLocation('Toronto', 'ON', 'CA', $lat = null, $long = null, $isp = 'comcast.net'),
 
             self::makeLocation('Nice', 'B8', 'FR', $lat = null, $long = null, $isp = 'comcast.net'),
@@ -218,5 +220,4 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Fixture
             self::makeLocation('Yokohama', '19', 'JP'),
         );
     }
-
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php b/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php
index 95eddf823f..88f673831c 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php
@@ -5,14 +5,16 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-#
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks 13 visits all with custom variables and referrer URLs
  * w/ sub-dirs (ie, /path/to/page/has/many/dirs.htm).
  */
-class Test_Piwik_Fixture_ManyVisitsWithSubDirReferrersAndCustomVars extends Fixture
+class ManyVisitsWithSubDirReferrersAndCustomVars extends Fixture
 {
     public $dateTime = '2010-03-05 11:22:33';
     public $idSite = 1;
@@ -65,4 +67,4 @@ class Test_Piwik_Fixture_ManyVisitsWithSubDirReferrersAndCustomVars extends Fixt
         $t->setUrl('http://example.org/page1.html');
         self::checkResponse($t->doTrackPageView('title'));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index 3eb5cb9ac2..ad1e6d8252 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -12,12 +12,14 @@ use Piwik\Access;
 use Piwik\Option;
 use ReflectionClass;
 use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
+use Piwik\Tests\Fixture;
+use Piwik\Tests\OverrideLogin;
 
 /**
  * This fixture is the combination of every other fixture defined by Piwik. Should be used
  * with year periods.
  */
-class OmniFixture extends \Fixture
+class OmniFixture extends Fixture
 {
     public $month = '2012-01';
     public $idSite = 'all';
@@ -49,7 +51,7 @@ class OmniFixture extends \Fixture
             ) {
                 $klassReflect = new ReflectionClass($className);
                 if (!strpos($klassReflect->getFilename(), "tests/PHPUnit/Fixtures")
-                    && $className != "Test_Piwik_Fixture_CustomAlerts"
+                    && $className != "CustomAlerts"
                     && $className != "Piwik\\Plugins\\Insights\\tests\\Fixtures\\SomeVisitsDifferentPathsOnTwoDays"
                 ) {
                     continue;
@@ -68,12 +70,12 @@ class OmniFixture extends \Fixture
             }
         }
 
-        $this->now = $this->fixtures['Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts']->now;
+        $this->now = $this->fixtures['ManySitesImportedLogsWithXssAttempts']->now;
 
-        // make sure Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts is the first fixture
-        $fixture = $this->fixtures['Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts'];
-        unset($this->fixtures['Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts']);
-        $this->fixtures = array_merge(array('Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts' => $fixture), $this->fixtures);
+        // make sure ManySitesImportedLogsWithXssAttempts is the first fixture
+        $fixture = $this->fixtures['Piwik\\Tests\\Fixtures\\ManySitesImportedLogsWithXssAttempts'];
+        unset($this->fixtures['Piwik\\Tests\\Fixtures\\ManySitesImportedLogsWithXssAttempts']);
+        $this->fixtures = array_merge(array('Piwik\\Tests\\Fixtures\\ManySitesImportedLogsWithXssAttempts' => $fixture), $this->fixtures);
     }
 
     private function adjustDateTime($dateTime, $adjustToDate)
@@ -109,7 +111,7 @@ class OmniFixture extends \Fixture
 
     public static function createAccessInstance()
     {
-        Access::setSingletonInstance($access = new \Test_Access_OverrideLogin());
+        Access::setSingletonInstance($access = new OverrideLogin());
         \Piwik\Piwik::postEvent('Request.initAuthenticationObject');
     }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
index 1445e78997..c4ed1564a0 100644
--- a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
+++ b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php
@@ -5,12 +5,15 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks one visit with several pageviews.
  */
-class Test_Piwik_Fixture_OneVisitSeveralPageViews extends Fixture
+class OneVisitSeveralPageViews extends Fixture
 {
     public $dateTime = '2010-03-06 11:22:33';
     public $idSite = 1;
diff --git a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php
index 0dcacc45a9..7a316bcc78 100644
--- a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php
+++ b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php
@@ -5,13 +5,16 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks one visit w/ pageview URLs that are not normalized.
  * These URLs use different protocols and a mix of lowercase & uppercase letters.
  */
-class Test_Piwik_Fixture_OneVisitWithAbnormalPageviewUrls extends Fixture
+class OneVisitWithAbnormalPageviewUrls extends Fixture
 {
     public $dateTime = '2010-03-06 11:22:33';
     public $idSite = 1;
@@ -64,4 +67,4 @@ class Test_Piwik_Fixture_OneVisitWithAbnormalPageviewUrls extends Fixture
         $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.6)->getDatetime());
         self::checkResponse($t->doTrackPageView('incredible.title/'));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
index 5626d5e9ed..50f576b33f 100644
--- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
+++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
@@ -5,14 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use Piwik\Tests\Fixture;
 
 /**
  * This fixture adds one website and tracks two visits by one visitor.
  */
-class Test_Piwik_Fixture_OneVisitorTwoVisits extends Fixture
+class OneVisitorTwoVisits extends Fixture
 {
     public $idSite = 1;
     public $idSiteEmptyBis;
@@ -175,4 +178,4 @@ class Test_Piwik_Fixture_OneVisitorTwoVisits extends Fixture
         // -
         // End of second visit
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php
index 462fd2a4b2..74254a586e 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks a couple conversions.
  */
-class Piwik_Test_Fixture_SomeVisitsAllConversions extends Fixture
+class SomeVisitsAllConversions extends Fixture
 {
     public $dateTime = '2009-01-04 00:11:42';
     public $idSite = 1;
@@ -91,4 +94,4 @@ class Piwik_Test_Fixture_SomeVisitsAllConversions extends Fixture
         $t->setForceNewVisit();
         $t->doTrackPageView('This is tracked in a new visit.');
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index 6e295b45ba..53db8ca2f5 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -5,14 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
+use PiwikTracker;
 
 /**
  * Add one site and track many visits with custom variables & campaign IDs and
  * use visit ID instead of heuristics.
  */
-class Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
+class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
 {
     public $dateTime = '2009-01-04 00:11:42';
     public $idSite = 1;
@@ -164,4 +168,4 @@ class Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics extends
         unset($_COOKIE[$refCookieName]);
         unset($_COOKIE[$customVarCookieName]);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index 01748bb907..1791b43750 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks a couple visits with many pageviews. The
  * pageviews are designed to have many transitions between pages.
  */
-class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Fixture
+class SomeVisitsManyPageviewsWithTransitions extends Fixture
 {
     public $dateTime = '2010-03-06 11:22:33';
     public $idSite = 1;
@@ -150,4 +153,4 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Fixture
             self::assertTrue($visit->doTrackEvent($searchCategory, "event name", $searchKeyword, $this->prefixCounter));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php b/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php
index 58f90494c1..6d5e2556b3 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks 7 visits w/ some long-ish urls (as page urls and
  * referrer urls).
  */
-class Test_Piwik_Fixture_SomeVisitsWithLongUrls extends Fixture
+class SomeVisitsWithLongUrls extends Fixture
 {
     public $dateTime = '2010-03-06 01:22:33';
     public $idSite = 1;
@@ -102,4 +105,4 @@ class Test_Piwik_Fixture_SomeVisitsWithLongUrls extends Fixture
         $t->setUrlReferrer('http://nz.bing.com/images/search?q=+++Kia+ora+++');
         self::checkResponse($t->doTrackPageView('incredible title!'));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php
index 7dc9d2e9cf..60969e7041 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one website and some visits with non unicode page titles.
  */
-class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Fixture
+class SomeVisitsWithNonUnicodePageTitles extends Fixture
 {
     public $idSite1 = 1;
     public $dateTime = '2010-01-03 11:22:33';
@@ -99,4 +102,4 @@ class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Fixture
         self::checkResponse($visitor->doTrackPageView('Site Search results'));
         $visitor->setPageCharset('');
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php
index 9113d5e4e7..4d29e6aff7 100644
--- a/tests/PHPUnit/Fixtures/SqlDump.php
+++ b/tests/PHPUnit/Fixtures/SqlDump.php
@@ -5,15 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Config;
 use Piwik\Db;
 use Piwik\Piwik;
+use Piwik\Tests\Fixture;
 
 /**
  * Reusable fixture. Loads a SQL dump into the DB.
  */
-class Piwik_Test_Fixture_SqlDump extends Fixture
+class SqlDump extends Fixture
 {
     public $date = '2012-09-03';
     public $dateTime = '2012-09-03';
diff --git a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php
index 6c4e318341..ac7abb6a4f 100644
--- a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php
+++ b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php
@@ -5,14 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Fixture that adds one site with three goals and tracks one pageview & one manual
  * goal conversion.
  */
-class Test_Piwik_Fixture_ThreeGoalsOnePageview extends Fixture
+class ThreeGoalsOnePageview extends Fixture
 {
     public $dateTime = '2009-01-04 00:11:42';
     public $idSite = 1;
@@ -67,4 +70,4 @@ class Test_Piwik_Fixture_ThreeGoalsOnePageview extends Fixture
         $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.3)->getDatetime());
         self::checkResponse($t->doTrackGoal($this->idGoal3, $revenue = 42.256));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
index 20c03a585a..f330218f9a 100644
--- a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
+++ b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php
@@ -5,14 +5,17 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds three websites with different site search configurations and adds
  * several visits to each of them.
  */
-class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Fixture
+class ThreeSitesWithManyVisitsWithSiteSearch extends Fixture
 {
     public $idSite1 = 1;
     public $idSite2 = 2;
@@ -205,6 +208,4 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Fixture
         $visitor->setUrl('http://example.org/index.htm?' . $crazyTitle);
         self::checkResponse($visitor->doTrackPageView('Pageview: ' . $crazyTitle));
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php
index 9481cd9f2e..938fe28c86 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds two sites and tracks some visits with ecommerce orders.
  */
-class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Fixture
+class TwoSitesEcommerceOrderWithItems extends Fixture
 {
     public $dateTime = '2011-04-05 00:11:42';
     public $idSite = 1;
@@ -207,9 +210,5 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Fixture
         $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(30.9)->getDatetime());
         $t->addEcommerceItem($sku = 'TRIPOD SKU', $name = 'TRIPOD - bought day after', $category = 'Tools', $price = 100, $quantity = 2);
         self::checkResponse($t->doTrackEcommerceOrder($orderId = '777', $grandTotal = 250));
-        //------------------------------------- End tracking
-
-
     }
-}
-
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php
index 326ca69d66..3ff7b56fa4 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php
@@ -5,14 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one website and tracks visits on different days over a month
  * using referrer URLs with search engines.
  */
-class Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers extends Fixture
+class TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers extends Fixture
 {
     public $dateTime = '2010-02-01 11:22:33';
     public $idSite = 1;
@@ -108,4 +111,4 @@ class Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferr
         }
         self::checkBulkTrackingResponse($t->doBulkTrack());
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
index e2df5f8258..4caa3e1be7 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
@@ -5,14 +5,17 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds two websites and tracks visits from two visitors on different days.
  */
-class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Fixture
+class TwoSitesTwoVisitorsDifferentDays extends Fixture
 {
     public $idSite1 = 1;
     public $idSite2 = 2;
@@ -179,6 +182,4 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Fixture
         $visitorAsite2->setGenerationTime(503);
         self::checkResponse($visitorAsite2->doTrackPageView(''));
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php
index d5a6415035..0d47c97815 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php
@@ -5,12 +5,15 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds two sites and tracks several visits all in the past.
  */
-class Test_Piwik_Fixture_TwoSitesVisitsInPast extends Fixture
+class TwoSitesVisitsInPast extends Fixture
 {
     public $dateTimeFirstDateWebsite1 = '2010-03-06 01:22:33';
     public $dateTimeDateInPastWebsite1 = '2010-01-06 01:22:33';
@@ -107,4 +110,4 @@ class Test_Piwik_Fixture_TwoSitesVisitsInPast extends Fixture
         $t->setUrl('http://example.org/category/Pageyy');
         self::checkResponse($t->doTrackPageView('Blabla'));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php
index 37cb956c51..370c5a864e 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php
@@ -5,14 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Access;
 use Piwik\Date;
 use Piwik\Plugins\Annotations\API;
+use Piwik\Tests\Fixture;
+use FakeAccess;
 
 /**
  * A fixture that adds two websites and annotations for each website.
  */
-class Test_Piwik_Fixture_TwoSitesWithAnnotations extends Fixture
+class TwoSitesWithAnnotations extends Fixture
 {
     public $dateTime = '2011-01-01 00:11:42';
     public $idSite1 = 1;
@@ -75,4 +79,4 @@ class Test_Piwik_Fixture_TwoSitesWithAnnotations extends Fixture
             self::createWebsite($this->dateTime, $ecommerce = 1);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php b/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php
index de6bb9b2e0..eb48a6bd61 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php
+++ b/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php
@@ -5,14 +5,17 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site and tracks two visits. One visit is a bot and one has no keyword
  * but is from a search engine.
  */
-class Test_Piwik_Fixture_TwoVisitsNoKeywordWithBot extends Fixture
+class TwoVisitsNoKeywordWithBot extends Fixture
 {
     public $dateTime = '2010-03-06 11:22:33';
     public $idSite = 1;
@@ -66,6 +69,5 @@ class Test_Piwik_Fixture_TwoVisitsNoKeywordWithBot extends Fixture
 
         // Test with empty title, that the output of Live is valid
         self::checkResponse($t->doTrackPageView(''));
-
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
index 8900eaace2..b2777b408f 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
+++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
@@ -5,13 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API as APIGoals;
+use Piwik\Tests\Fixture;
+use PiwikTracker;
 
 /**
  * Tracks custom events
  */
-class Test_Piwik_Fixture_TwoVisitsWithCustomEvents extends Fixture
+class TwoVisitsWithCustomEvents extends Fixture
 {
     public $dateTime = '2010-01-03 11:22:33';
     public $idSite = 1;
@@ -186,5 +190,4 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomEvents extends Fixture
     public function tearDown()
     {
     }
-
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php
index ccf0120d7b..5ed8c06b85 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php
+++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php
@@ -5,13 +5,16 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site with two goals and tracks two visits with custom variables.
  */
-class Test_Piwik_Fixture_TwoVisitsWithCustomVariables extends Fixture
+class TwoVisitsWithCustomVariables extends Fixture
 {
     public $dateTime = '2010-01-03 11:22:33';
     public $idSite = 1;
@@ -146,4 +149,4 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomVariables extends Fixture
         $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(2)->getDatetime());
         self::checkResponse($visitorB->doTrackAction('http://test.com', 'link'));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index ed19987143..50c49bade9 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -19,12 +19,13 @@ use Piwik\Option;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
 use Piwik\WidgetsList;
-use Fixture;
+use Piwik\Tests\Fixture;
+use Piwik\Tests\OverrideLogin;
 
 /**
  * Fixture for UI tests.
  */
-class UITestFixture extends \Piwik_Test_Fixture_SqlDump
+class UITestFixture extends SqlDump
 {
     const FIXTURE_LOCATION = '/tests/resources/OmniFixture-dump.sql.gz';
 
@@ -296,7 +297,7 @@ class UITestFixture extends \Piwik_Test_Fixture_SqlDump
 
     public static function createAccessInstance()
     {
-        Access::setSingletonInstance($access = new \Test_Access_OverrideLogin());
+        Access::setSingletonInstance($access = new OverrideLogin());
         \Piwik\Piwik::postEvent('Request.initAuthenticationObject');
     }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php
index 6492ebd1db..98cc3b50aa 100644
--- a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
+use Piwik\Tests\Fixture;
 
 /**
  * Import a same visitor, over three different days, in reverse chronological order
  * useful to test there are three visits are created for this visitor, as expected
  *
  */
-class Test_Piwik_Fixture_VisitOverSeveralDaysImportedLogs extends Fixture
+class VisitOverSeveralDaysImportedLogs extends Fixture
 {
     public $dateTime = '2013-04-07 19:00:00';
     public $idSite = 1;
@@ -52,5 +55,4 @@ class Test_Piwik_Fixture_VisitOverSeveralDaysImportedLogs extends Fixture
 
         self::executeLogImporter($logFile, $opts);
     }
-
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php b/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php
index f47962e6d7..19c7fcc062 100644
--- a/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php
+++ b/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php
@@ -5,12 +5,15 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one site with a non UTC timezone and tracks a couple visits near the end of the day.
  */
-class Test_Piwik_Fixture_VisitsInDifferentTimezones extends Fixture
+class VisitsInDifferentTimezones extends Fixture
 {
     public $idSite = 1;
     public $dateTime = '2010-03-06';
diff --git a/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php b/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php
index d0b08c957d..caf67e00aa 100644
--- a/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php
+++ b/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php
@@ -5,13 +5,16 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\Fixtures;
+
 use Piwik\Date;
+use Piwik\Tests\Fixture;
 
 /**
  * Adds one website and tracks several visits from one visitor on
  * different days that span about a month apart.
  */
-class Test_Piwik_Fixture_VisitsOverSeveralDays extends Fixture
+class VisitsOverSeveralDays extends Fixture
 {
     public $dateTimes = array(
         '2010-12-14 01:00:00',
@@ -121,4 +124,4 @@ class Test_Piwik_Fixture_VisitsOverSeveralDays extends Fixture
         $tracker->setDebugStringAppend($debugStringAppend);
         return $tracker;
     }
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php
index f4bb6cf62a..2dfd150e18 100755
--- a/tests/PHPUnit/Integration/AnnotationsTest.php
+++ b/tests/PHPUnit/Integration/AnnotationsTest.php
@@ -11,6 +11,7 @@ use Piwik\Access;
 use Piwik\API\Request;
 use Piwik\Plugins\Annotations\API;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesWithAnnotations;
 use FakeAccess;
 use Exception;
 
@@ -284,4 +285,4 @@ class AnnotationsTest extends IntegrationTestCase
     }
 }
 
-AnnotationsTest::$fixture = new \Test_Piwik_Fixture_TwoSitesWithAnnotations();
\ No newline at end of file
+AnnotationsTest::$fixture = new TwoSitesWithAnnotations();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
index ac89784ded..db49a8852b 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
+++ b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\API\Proxy;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
 
 /**
  * This tests the output of the API plugin API
@@ -88,4 +89,4 @@ class ApiGetReportMetadataTest extends IntegrationTestCase
     }
 }
 
-ApiGetReportMetadataTest::$fixture = new \Test_Piwik_Fixture_ThreeGoalsOnePageview();
\ No newline at end of file
+ApiGetReportMetadataTest::$fixture = new ThreeGoalsOnePageview();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
index 73b2a27d52..44da8df449 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
+++ b/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\InvalidVisits;
 
 /**
  * test the Yearly metadata API response,
@@ -47,5 +48,5 @@ class ApiGetReportMetadataYearTest extends IntegrationTestCase
     }
 }
 
-ApiGetReportMetadataYearTest::$fixture = new \Test_Piwik_Fixture_InvalidVisits();
+ApiGetReportMetadataYearTest::$fixture = new InvalidVisits();
 ApiGetReportMetadataYearTest::$fixture->trackInvalidRequests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 92d7eb5947..eceb90a482 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -10,6 +10,8 @@ namespace Piwik\Tests\Integration;
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManySitesImportedLogs;
+use Piwik\Tests\Fixture;
 use Exception;
 
 /**
@@ -56,8 +58,8 @@ class ArchiveCronTest extends IntegrationTestCase
                                                       'segment'    => 'browserCode==EP',
                                                       'testSuffix' => '_nonPreArchivedSegment'));
 
-        $segments = array(\Test_Piwik_Fixture_ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED,
-                          \Test_Piwik_Fixture_ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED
+        $segments = array(ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED,
+                          ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED
         );
         foreach($segments as $segment) {
             // TODO debugging travis
@@ -127,7 +129,7 @@ class ArchiveCronTest extends IntegrationTestCase
     private function runArchivePhpCron()
     {
         $archivePhpScript = PIWIK_INCLUDE_PATH . '/tests/PHPUnit/proxy/archive.php';
-        $urlToProxy = \Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php';
+        $urlToProxy = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php';
 
         // create the command
         $cmd = "php \"$archivePhpScript\" --url=\"$urlToProxy\" 2>&1";
@@ -164,5 +166,5 @@ class ArchiveCronTest extends IntegrationTestCase
     }
 }
 
-ArchiveCronTest::$fixture = new \Test_Piwik_Fixture_ManySitesImportedLogs();
+ArchiveCronTest::$fixture = new ManySitesImportedLogs();
 ArchiveCronTest::$fixture->addSegments = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php
index cf612555a5..4beb564304 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/Integration/ArchiveWebTest.php
@@ -10,6 +10,8 @@ namespace Piwik\Tests\Integration;
 use Piwik\Option;
 use Piwik\Http;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManySitesImportedLogs;
+use Piwik\Tests\Fixture;
 use Exception;
 
 /**
@@ -30,8 +32,8 @@ class ArchiveWebTest extends IntegrationTestCase
 
         self::deleteArchiveTables();
 
-        $host  = \Fixture::getRootUrl();
-        $token = \Fixture::getTokenAuth();
+        $host  = Fixture::getRootUrl();
+        $token = Fixture::getTokenAuth();
 
         $urlTmp = Option::get('piwikUrl');
         Option::set('piwikUrl', $host . 'tests/PHPUnit/proxy/index.php');
@@ -75,5 +77,5 @@ class ArchiveWebTest extends IntegrationTestCase
     }
 }
 
-ArchiveWebTest::$fixture = new \Test_Piwik_Fixture_ManySitesImportedLogs();
+ArchiveWebTest::$fixture = new ManySitesImportedLogs();
 ArchiveWebTest::$fixture->addSegments = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php
index 20e2bfc011..f415241dab 100644
--- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php
+++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php
@@ -10,6 +10,8 @@ namespace Piwik\Tests\Integration;
 use Piwik\API\Request;
 use Piwik\Date;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
+use Piwik\Tests\Fixture;
 
 /**
  * testing a the auto suggest API for all known segments
@@ -39,7 +41,7 @@ class AutoSuggestAPITest extends IntegrationTestCase
     public function getApiForTesting()
     {
         // we will test all segments from all plugins
-        \Fixture::loadAllPlugins();
+        Fixture::loadAllPlugins();
 
         $idSite = self::$fixture->idSite;
         $apiForTesting = array();
@@ -143,5 +145,5 @@ class AutoSuggestAPITest extends IntegrationTestCase
     }
 }
 
-AutoSuggestAPITest::$fixture = new \Test_Piwik_Fixture_ManyVisitsWithGeoIP();
+AutoSuggestAPITest::$fixture = new ManyVisitsWithGeoIP();
 AutoSuggestAPITest::$fixture->dateTime = Date::yesterday()->subDay(30)->getDatetime();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 7826eeb32e..1331786c69 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -11,6 +11,8 @@ use Piwik\Common;
 use Piwik\Db;
 use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\SqlDump;
+use Piwik\Tests\Fixture;
 
 /**
  * Tests that Piwik 2.0 works w/ data from Piwik 1.12.
@@ -28,7 +30,7 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase
     {
         parent::setUpBeforeClass();
 
-        $result = \Fixture::updateDatabase();
+        $result = Fixture::updateDatabase();
         if ($result === false) {
             throw new \Exception("Failed to update pre-2.0 database (nothing to update).");
         }
@@ -39,15 +41,15 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase
         }
 
         // add two visits from same visitor on dec. 29
-        $t = \Fixture::getTracker(1, '2012-12-29 01:01:30', $defaultInit = true);
+        $t = Fixture::getTracker(1, '2012-12-29 01:01:30', $defaultInit = true);
         $t->setUrl('http://site.com/index.htm');
         $t->setIp('136.5.3.2');
-        \Fixture::checkResponse($t->doTrackPageView('incredible title!'));
+        Fixture::checkResponse($t->doTrackPageView('incredible title!'));
 
         $t->setForceVisitDateTime('2012-12-29 03:01:30');
         $t->setUrl('http://site.com/other/index.htm');
         $t->DEBUG_APPEND_URL = '&_idvc=2'; // make sure visit is marked as returning
-        \Fixture::checkResponse($t->doTrackPageView('other incredible title!'));
+        Fixture::checkResponse($t->doTrackPageView('other incredible title!'));
 
         // launch archiving
         VisitFrequencyApi::getInstance()->get(1, 'year', '2012-12-29');
@@ -104,6 +106,6 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase
     }
 }
 
-BackwardsCompatibility1XTest::$fixture = new \Piwik_Test_Fixture_SqlDump();
+BackwardsCompatibility1XTest::$fixture = new SqlDump();
 BackwardsCompatibility1XTest::$fixture->dumpUrl = PIWIK_INCLUDE_PATH . BackwardsCompatibility1XTest::FIXTURE_LOCATION;
 BackwardsCompatibility1XTest::$fixture->tablesPrefix = '';
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
index 2f15d80c74..8010501886 100755
--- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/Integration/BlobReportLimitingTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Config;
 use Piwik\Plugins\Actions\ArchivingHelper;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
@@ -161,5 +162,5 @@ class BlobReportLimitingTest extends IntegrationTestCase
     }
 }
 
-BlobReportLimitingTest::$fixture = new \Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider();
+BlobReportLimitingTest::$fixture = new ManyVisitsWithMockLocationProvider();
 BlobReportLimitingTest::$fixture->createConfig = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/Integration/CsvExportTest.php
index ab95df0760..371875fa0b 100755
--- a/tests/PHPUnit/Integration/CsvExportTest.php
+++ b/tests/PHPUnit/Integration/CsvExportTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * Test CSV export with Expanded rows, Translated labels, Different languages
@@ -77,7 +78,7 @@ class CsvExportTest extends IntegrationTestCase
     }
 }
 
-CsvExportTest::$fixture = new \Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
+CsvExportTest::$fixture = new TwoVisitsWithCustomVariables();
 CsvExportTest::$fixture->visitorId = null;
 CsvExportTest::$fixture->useEscapedQuotes = false;
 CsvExportTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/CustomEventsTest.php b/tests/PHPUnit/Integration/CustomEventsTest.php
index 50c8e3defa..c2a3bd9c62 100644
--- a/tests/PHPUnit/Integration/CustomEventsTest.php
+++ b/tests/PHPUnit/Integration/CustomEventsTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
 
 /**
  * Testing Custom Events
@@ -137,4 +138,4 @@ class CustomEventsTest extends IntegrationTestCase
     }
 }
 
-CustomEventsTest::$fixture = new \Test_Piwik_Fixture_TwoVisitsWithCustomEvents();
\ No newline at end of file
+CustomEventsTest::$fixture = new TwoVisitsWithCustomEvents();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
index 4674d4f39b..e4f5fc154b 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Date;
 use Piwik\Piwik;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems;
 
 /**
  * Tests API methods after ecommerce orders are tracked.
@@ -254,4 +255,4 @@ class EcommerceOrderWithItemsTest extends IntegrationTestCase
     }
 }
 
-EcommerceOrderWithItemsTest::$fixture = new \Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems();
\ No newline at end of file
+EcommerceOrderWithItemsTest::$fixture = new TwoSitesEcommerceOrderWithItems();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/Integration/FlattenReportsTest.php
index 1b06f63829..389f3c0e7b 100644
--- a/tests/PHPUnit/Integration/FlattenReportsTest.php
+++ b/tests/PHPUnit/Integration/FlattenReportsTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars;
 
 /**
  * Tests the flattening of reports.
@@ -124,4 +125,4 @@ class FlattenReportsTest extends IntegrationTestCase
     }
 }
 
-FlattenReportsTest::$fixture = new \Test_Piwik_Fixture_ManyVisitsWithSubDirReferrersAndCustomVars();
\ No newline at end of file
+FlattenReportsTest::$fixture = new ManyVisitsWithSubDirReferrersAndCustomVars();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php
index 0bb86eedfd..83b1da785a 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/Integration/ImportLogsTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 
 /**
  * Tests the log importer.
@@ -101,4 +102,4 @@ class ImportLogsTest extends IntegrationTestCase
     }
 }
 
-ImportLogsTest::$fixture = new \Test_Piwik_Fixture_ManySitesImportedLogs();
\ No newline at end of file
+ImportLogsTest::$fixture = new ManySitesImportedLogs();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php
index e919a0f605..d7f3c3ffde 100644
--- a/tests/PHPUnit/Integration/LabelFilterTest.php
+++ b/tests/PHPUnit/Integration/LabelFilterTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\OneVisitSeveralPageViews;
 
 /**
  * Tests the class LabelFilter.
@@ -155,4 +156,4 @@ class LabelFilterTest extends IntegrationTestCase
     }
 }
 
-LabelFilterTest::$fixture = new \Test_Piwik_Fixture_OneVisitSeveralPageViews();
\ No newline at end of file
+LabelFilterTest::$fixture = new OneVisitSeveralPageViews();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
index 0176397bc2..edf52ffbfd 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
@@ -11,6 +11,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
 use Piwik\Date;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
 
 /**
  * Tests w/ 14 visitors w/ 2 visits each.
@@ -130,4 +131,4 @@ class ManyVisitorsOneWebsiteTest extends IntegrationTestCase
     }
 }
 
-ManyVisitorsOneWebsiteTest::$fixture = new \Test_Piwik_Fixture_ManyVisitsWithGeoIP();
\ No newline at end of file
+ManyVisitorsOneWebsiteTest::$fixture = new ManyVisitsWithGeoIP();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php
index cb0ec186e3..19a09a45f9 100755
--- a/tests/PHPUnit/Integration/NoVisitTest.php
+++ b/tests/PHPUnit/Integration/NoVisitTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\InvalidVisits;
 
 /**
  * testing various wrong Tracker requests and check that they behave as expected:
@@ -49,4 +50,4 @@ class NoVisitTest extends IntegrationTestCase
     }
 }
 
-NoVisitTest::$fixture = new \Test_Piwik_Fixture_InvalidVisits();
\ No newline at end of file
+NoVisitTest::$fixture = new InvalidVisits();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php
index 3a7f1aea8f..cb9153a0ba 100755
--- a/tests/PHPUnit/Integration/NonUnicodeTest.php
+++ b/tests/PHPUnit/Integration/NonUnicodeTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles;
 
 /**
  * Tests that visits track & reports display correctly when non-unicode text is
@@ -51,4 +52,4 @@ class NonUnicodeTest extends IntegrationTestCase
 
 }
 
-NonUnicodeTest::$fixture = new \Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles();
\ No newline at end of file
+NonUnicodeTest::$fixture = new SomeVisitsWithNonUnicodePageTitles();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
index 605ed30900..62b94edcea 100644
--- a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+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
@@ -50,4 +51,4 @@ class OneVisitorLongUrlsTruncatedTest extends IntegrationTestCase
     }
 }
 
-OneVisitorLongUrlsTruncatedTest::$fixture = new \Test_Piwik_Fixture_SomeVisitsWithLongUrls();
\ No newline at end of file
+OneVisitorLongUrlsTruncatedTest::$fixture = new SomeVisitsWithLongUrls();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
index 94d6e6df26..c2d8ba430b 100755
--- a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot;
 
 /**
  * 1) Tests empty google kwd works nicely in Live! output and Top keywords
@@ -52,4 +53,4 @@ class OneVisitorNoKeywordSpecifiedTest extends IntegrationTestCase
     }
 }
 
-OneVisitorNoKeywordSpecifiedTest::$fixture = new \Test_Piwik_Fixture_TwoVisitsNoKeywordWithBot();
\ No newline at end of file
+OneVisitorNoKeywordSpecifiedTest::$fixture = new TwoVisitsNoKeywordWithBot();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 5970cccc71..b7252a11d7 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -11,6 +11,7 @@ use Piwik\Common;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
 
 /**
  * Tests some API using range periods & makes sure the correct amount of blob/numeric
@@ -182,4 +183,4 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends IntegrationT
 
 }
 
-OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new \Test_Piwik_Fixture_VisitsOverSeveralDays();
\ No newline at end of file
+OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
index 887d2b690b..e877166a25 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
 
 /**
  * Use case testing various important features:
@@ -99,4 +100,4 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeTest extends IntegrationTestCase
     }
 }
 
-OneVisitorOneWebsiteSeveralDaysDateRangeTest::$fixture = new \Test_Piwik_Fixture_VisitsOverSeveralDays();
\ No newline at end of file
+OneVisitorOneWebsiteSeveralDaysDateRangeTest::$fixture = new VisitsOverSeveralDays();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php b/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
index f4c84a56c5..5c4f427e79 100644
--- a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\VisitOverSeveralDaysImportedLogs;
 
 /**
  * @group Integration
@@ -46,4 +47,4 @@ class OneVisitorSeveralDaysImportedInRandomOrderTest extends IntegrationTestCase
     }
 }
 
-OneVisitorSeveralDaysImportedInRandomOrderTest::$fixture = new \Test_Piwik_Fixture_VisitOverSeveralDaysImportedLogs();
\ No newline at end of file
+OneVisitorSeveralDaysImportedInRandomOrderTest::$fixture = new VisitOverSeveralDaysImportedLogs();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
index 90abca6dfb..94f8f79153 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\API\Proxy;
 use Piwik\Archive;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 use Exception;
 
 /**
@@ -228,5 +229,5 @@ class OneVisitorTwoVisitsTest extends IntegrationTestCase
     }
 }
 
-OneVisitorTwoVisitsTest::$fixture = new \Test_Piwik_Fixture_OneVisitorTwoVisits();
+OneVisitorTwoVisitsTest::$fixture = new OneVisitorTwoVisits();
 OneVisitorTwoVisitsTest::$fixture->excludeMozilla = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
index 3658440da5..a266118018 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 
 /**
  * Same as OneVisitorTwoVisits.test.php, but with cookie support, which incurs some slight changes
@@ -47,6 +48,6 @@ class OneVisitorTwoVisitsWithCookieSupportTest extends IntegrationTestCase
     }
 }
 
-OneVisitorTwoVisitsWithCookieSupportTest::$fixture = new \Test_Piwik_Fixture_OneVisitorTwoVisits();
+OneVisitorTwoVisitsWithCookieSupportTest::$fixture = new OneVisitorTwoVisits();
 OneVisitorTwoVisitsWithCookieSupportTest::$fixture->useThirdPartyCookies = true;
 OneVisitorTwoVisitsWithCookieSupportTest::$fixture->useSiteSearch = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
index c5df1fe354..cbf5b2e5f7 100755
--- a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
+++ b/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * test Metadata API + period=range&date=lastN
@@ -85,5 +86,5 @@ class PeriodIsRangeDateIsLastNMetadataAndNormalAPITest extends IntegrationTestCa
     }
 }
 
-PeriodIsRangeDateIsLastNMetadataAndNormalAPITest::$fixture = new \Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
+PeriodIsRangeDateIsLastNMetadataAndNormalAPITest::$fixture = new TwoVisitsWithCustomVariables();
 PeriodIsRangeDateIsLastNMetadataAndNormalAPITest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/Integration/PrivacyManagerTest.php
index 5a35b7fb95..591be30265 100644
--- a/tests/PHPUnit/Integration/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/PrivacyManagerTest.php
@@ -26,6 +26,7 @@ use Piwik\Site;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\GoalManager;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixture;
 
 require_once 'PrivacyManager/PrivacyManager.php';
 
@@ -611,12 +612,12 @@ class PrivacyManagerTest extends IntegrationTestCase
         //   - http://whatever.com/42/{$daysSinceLastVisit}
 
         $start = Date::factory(self::$dateTime);
-        self::$idSite = \Fixture::createWebsite('2012-01-01', $ecommerce = 1);
+        self::$idSite = Fixture::createWebsite('2012-01-01', $ecommerce = 1);
         $idGoal = APIGoals::getInstance()->addGoal(self::$idSite, 'match all', 'url', 'http', 'contains');
 
-        $t = \Fixture::getTracker(self::$idSite, $start, $defaultInit = true);
+        $t = Fixture::getTracker(self::$idSite, $start, $defaultInit = true);
         $t->enableBulkTracking();
-        $t->setTokenAuth(\Fixture::getTokenAuth());
+        $t->setTokenAuth(Fixture::getTokenAuth());
 
         for ($daysAgo = self::$daysAgoStart; $daysAgo >= 0; $daysAgo -= 5) // one visit every 5 days
         {
@@ -644,7 +645,7 @@ class PrivacyManagerTest extends IntegrationTestCase
             $t->doTrackEcommerceOrder($orderId = '937nsjusu ' . $dateTime, $grandTotal = 1111.11, $subTotal = 1000,
                 $tax = 111, $shipping = 0.11, $discount = 666);
         }
-        \Fixture::checkBulkTrackingResponse($t->doBulkTrack());
+        Fixture::checkBulkTrackingResponse($t->doBulkTrack());
     }
 
     protected static function _addReportData()
diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/Integration/PurgeDataTest.php
index 9d694553d7..06e3e7595a 100755
--- a/tests/PHPUnit/Integration/PurgeDataTest.php
+++ b/tests/PHPUnit/Integration/PurgeDataTest.php
@@ -13,6 +13,7 @@ use Piwik\API\Request;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\Plugins\PrivacyManager\ReportsPurger;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
 
 /**
  * TODO: shouldn't this be merged w/ PrivacyManagerTest? the original data purging tests are there
@@ -181,4 +182,4 @@ class PurgeDataTest extends IntegrationTestCase
     }
 }
 
-PurgeDataTest::$fixture = new \Test_Piwik_Fixture_OneVisitorTwoVisits();
\ No newline at end of file
+PurgeDataTest::$fixture = new OneVisitorTwoVisits();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php
index 1ffc104025..6fac424f54 100755
--- a/tests/PHPUnit/Integration/RowEvolutionTest.php
+++ b/tests/PHPUnit/Integration/RowEvolutionTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers;
 
 /**
  * Tests the method API.getRowEvolution
@@ -235,4 +236,4 @@ class RowEvolutionTest extends IntegrationTestCase
     }
 }
 
-RowEvolutionTest::$fixture = new \Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers();
\ No newline at end of file
+RowEvolutionTest::$fixture = new TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php
index 42ff59e6b2..0ae3c73fd2 100755
--- a/tests/PHPUnit/Integration/SiteSearchTest.php
+++ b/tests/PHPUnit/Integration/SiteSearchTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch;
 
 /**
  * Testing the various use cases w/ internal Site Search tracking
@@ -91,4 +92,4 @@ class SiteSearchTest extends IntegrationTestCase
     }
 }
 
-SiteSearchTest::$fixture = new \Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch();
\ No newline at end of file
+SiteSearchTest::$fixture = new ThreeSitesWithManyVisitsWithSiteSearch();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TimezonesTest.php b/tests/PHPUnit/Integration/TimezonesTest.php
index dbcae0065c..1603c23cb4 100644
--- a/tests/PHPUnit/Integration/TimezonesTest.php
+++ b/tests/PHPUnit/Integration/TimezonesTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Date;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\VisitsInDifferentTimezones;
 
 /**
  * Test reports using visits for a site with a non-UTC timezone.
@@ -54,4 +55,4 @@ class TimezonesTest extends IntegrationTestCase
     }
 }
 
-TimezonesTest::$fixture = new \Test_Piwik_Fixture_VisitsInDifferentTimezones();
\ No newline at end of file
+TimezonesTest::$fixture = new VisitsInDifferentTimezones();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
index e0bc9a39dc..3f45410510 100755
--- a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
+++ b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics;
 
 /**
  * Test tracker & API when forcing the use of visit ID instead of heuristics. Also
@@ -45,4 +46,4 @@ class TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest extends
 }
 
 TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest::$fixture =
-    new \Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics();
\ No newline at end of file
+    new SomeVisitsCustomVariablesCampaignsNotHeuristics();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
index bfbfc60485..6ed0f41a46 100755
--- a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
+++ b/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\SomeVisitsAllConversions;
 
 /**
  * Tests API methods with goals that do and don't allow multiple
@@ -63,4 +64,4 @@ class TrackGoalsAllowMultipleConversionsPerVisitTest extends IntegrationTestCase
     }
 }
 
-TrackGoalsAllowMultipleConversionsPerVisitTest::$fixture = new \Piwik_Test_Fixture_SomeVisitsAllConversions();
\ No newline at end of file
+TrackGoalsAllowMultipleConversionsPerVisitTest::$fixture = new SomeVisitsAllConversions();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
index 2b186f1127..58f1eecde7 100644
--- a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
+++ b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
 
 /**
  * Testing that, when using window_look_back_for_visitor with a high value,
@@ -46,5 +47,5 @@ class TrackerWindowLookBackTest extends IntegrationTestCase
     }
 }
 
-TrackerWindowLookBackTest::$fixture = new \Test_Piwik_Fixture_VisitsOverSeveralDays();
+TrackerWindowLookBackTest::$fixture = new VisitsOverSeveralDays();
 TrackerWindowLookBackTest::$fixture->forceLargeWindowLookBackForVisitor = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php b/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php
index 7c4168838b..86885f513d 100644
--- a/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php
+++ b/tests/PHPUnit/Integration/TrackingAPISetVisitorIdTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\API\Proxy;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId;
 
 /**
  * This test tests that when using &cid=, the visitor ID is enforced
@@ -55,4 +56,4 @@ class TrackingAPISetVisitorIdTest extends IntegrationTestCase
     }
 }
 
-TrackingAPISetVisitorIdTest::$fixture = new \Test_Piwik_Fixture_FewVisitsWithSetVisitorId();
\ No newline at end of file
+TrackingAPISetVisitorIdTest::$fixture = new FewVisitsWithSetVisitorId();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TransitionsTest.php b/tests/PHPUnit/Integration/TransitionsTest.php
index 3b256eb6a9..7bb55b9f56 100644
--- a/tests/PHPUnit/Integration/TransitionsTest.php
+++ b/tests/PHPUnit/Integration/TransitionsTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions;
 
 /**
  * Tests the transitions plugin.
@@ -87,4 +88,4 @@ class TransitionsTest extends IntegrationTestCase
     }
 }
 
-TransitionsTest::$fixture = new \Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions();
\ No newline at end of file
+TransitionsTest::$fixture = new SomeVisitsManyPageviewsWithTransitions();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
index b5101d08a0..747b733a9c 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
 /**
  * Tests IndexedBySite optimizations when archiving is disabled.
@@ -87,6 +88,5 @@ class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends Integrati
     }
 }
 
-TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest::$fixture =
-    new \Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays();
+TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest::$fixture = new TwoSitesTwoVisitorsDifferentDays();
 TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest::$fixture->allowConversions = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 171f349343..9557cba704 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
 require_once 'Goals/Goals.php';
 
@@ -114,6 +115,5 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends IntegrationTest
     }
 }
 
-TwoVisitorsTwoWebsitesDifferentDaysConversionsTest::$fixture =
-    new \Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays();
+TwoVisitorsTwoWebsitesDifferentDaysConversionsTest::$fixture = new TwoSitesTwoVisitorsDifferentDays();
 TwoVisitorsTwoWebsitesDifferentDaysConversionsTest::$fixture->allowConversions = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index 7e79727510..f4c14d3569 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
 /**
  * tests Tracker several websites, different days.
@@ -108,4 +109,4 @@ class TwoVisitorsTwoWebsitesDifferentDaysTest extends IntegrationTestCase
     }
 }
 
-TwoVisitorsTwoWebsitesDifferentDaysTest::$fixture = new \Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays();
\ No newline at end of file
+TwoVisitorsTwoWebsitesDifferentDaysTest::$fixture = new TwoSitesTwoVisitorsDifferentDays();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
index 43a2be9b8f..1f31497a53 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * Tests use of custom variable segments.
@@ -62,6 +63,5 @@ class TwoVisitsWithCustomVariablesSegmentContainsTest extends IntegrationTestCas
     }
 }
 
-TwoVisitsWithCustomVariablesSegmentContainsTest::$fixture
-    = new \Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
+TwoVisitsWithCustomVariablesSegmentContainsTest::$fixture = new TwoVisitsWithCustomVariables();
 TwoVisitsWithCustomVariablesSegmentContainsTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
index 235d832d3c..d800deca65 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * @group Integration
@@ -49,5 +50,5 @@ class TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest extends Integrat
     }
 }
 
-TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest::$fixture = new \Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
+TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest::$fixture = new TwoVisitsWithCustomVariables();
 TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index 33a9b82522..1c0af3449a 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -9,6 +9,8 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\Plugins\API\API;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
+use Piwik\Tests\Fixture;
 
 /**
  * testing a segment containing all supported fields
@@ -31,7 +33,7 @@ class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends IntegrationTestCa
     public function getApiForTesting()
     {
         // we will test all segments from all plugins
-        \Fixture::loadAllPlugins();
+        Fixture::loadAllPlugins();
 
         $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables');
 
@@ -87,6 +89,5 @@ class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends IntegrationTestCa
     }
 }
 
-TwoVisitsWithCustomVariablesSegmentMatchNONETest::$fixture
-    = new \Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
+TwoVisitsWithCustomVariablesSegmentMatchNONETest::$fixture = new TwoVisitsWithCustomVariables();
 TwoVisitsWithCustomVariablesSegmentMatchNONETest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index 84bad309a5..50c76d3a16 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * Tests use of custom variable segments.
@@ -109,5 +110,5 @@ class TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest extends Integratio
     }
 }
 
-TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest::$fixture = new \Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
+TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest::$fixture = new TwoVisitsWithCustomVariables();
 TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest::$fixture->doExtraQuoteTests = false;
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
index b97667ecf9..a9fafeddb8 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
@@ -7,8 +7,8 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Test_Piwik_Fixture_TwoVisitsWithCustomVariables;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 
 /**
  * Tests w/ two visits & custom variables.
@@ -60,4 +60,4 @@ class TwoVisitsWithCustomVariablesTest extends IntegrationTestCase
     }
 }
 
-TwoVisitsWithCustomVariablesTest::$fixture = new Test_Piwik_Fixture_TwoVisitsWithCustomVariables();
\ No newline at end of file
+TwoVisitsWithCustomVariablesTest::$fixture = new TwoVisitsWithCustomVariables();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php
index 6a0478caa8..867fdcad60 100644
--- a/tests/PHPUnit/Integration/UrlNormalizationTest.php
+++ b/tests/PHPUnit/Integration/UrlNormalizationTest.php
@@ -10,8 +10,8 @@ namespace Piwik\Tests\Integration;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Tracker\Action;
-use Test_Piwik_Fixture_OneVisitWithAbnormalPageviewUrls;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls;
 
 /**
  * Tests the URL normalization.
@@ -120,4 +120,4 @@ class UrlNormalizationTest extends IntegrationTestCase
     }
 }
 
-UrlNormalizationTest::$fixture = new Test_Piwik_Fixture_OneVisitWithAbnormalPageviewUrls();
\ No newline at end of file
+UrlNormalizationTest::$fixture = new OneVisitWithAbnormalPageviewUrls();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
index e3bfb9faae..aed03b9343 100644
--- a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
+++ b/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Tests\Integration;
 
 use Piwik\API\Request;
 use Piwik\Tests\IntegrationTestCase;
+use Piwik\Tests\Fixtures\TwoSitesVisitsInPast;
 use Exception;
 
 /**
@@ -138,4 +139,4 @@ class VisitsInPastInvalidateOldReportsTest extends IntegrationTestCase
     }
 }
 
-VisitsInPastInvalidateOldReportsTest::$fixture = new \Test_Piwik_Fixture_TwoSitesVisitsInPast();
\ No newline at end of file
+VisitsInPastInvalidateOldReportsTest::$fixture = new TwoSitesVisitsInPast();
\ No newline at end of file
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 448271e866..abe5659c43 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -20,7 +20,6 @@ use Piwik\ReportRenderer;
 use Piwik\Translate;
 use Piwik\UrlHelper;
 use Piwik\Log;
-use Fixture;
 use PHPUnit_Framework_TestCase;
 
 require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
@@ -204,7 +203,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
             )
         );
 
-        if(Fixture::canImagesBeIncludedInScheduledReports()) {
+        if (Fixture::canImagesBeIncludedInScheduledReports()) {
             // PDF Scheduled Report
             // tests/PHPUnit/Integration/processed/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
             array_push(
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index b142f67878..d47267e4c4 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit b142f678787220ed85ea6510b5921834508f41c6
+Subproject commit d47267e4c4cbdb6b7e50da4902368cb0df1e56ea
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index ea2d0aa3aa..4058a867d4 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -78,7 +78,7 @@ Try again.
 -> If you still get this message, you can work around it by specifying Host + Request_Uri at the top of this file tests/PHPUnit/bootstrap.php. <-";
         exit(1);
     }
-    $baseUrl = Fixture::getRootUrl();
+    $baseUrl = \Piwik\Tests\Fixture::getRootUrl();
 
     \Piwik\SettingsPiwik::checkPiwikServerWorking($baseUrl, $acceptInvalidSSLCertificates = true);
 }
-- 
GitLab