diff --git a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php
index 11ca6052979a08b9d9a4ebfb141186f73e8f203b..8060eb25a77e0002b6a2182d6df0baff318ed9ef 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 40aff52ad80a01090a034b8e4ede38002c5b3af4..f0515abfb187d399695f0d97574954e6acc29f6e 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 a665a06d96c484517f489f0e883c9f22e84417bc..c5314d3aa3d4d27be9d231e52df1ee3f591d5a2e 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 059619c483029ead3c2d0acd89392a146a6c34fa..41bd85ddf16ff13b225ad644021fce48c7d5946a 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 ab5e02a7ed9c48766dfaed135f969b35746efc00..e65ae09d8d5b5181ec0f54b7c7e9313b58222b9f 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 75015a0766966b8d8327b7099bd49399e24323d5..d6882cf1eca25e622c8cf3fdc56049b79393de6a 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 a43d12661d44d260b1d441d395561235622f0e80..33e13f7999b6ef72a9b5bbf243f9a4ad06e97b4b 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 83695ef5316238d889f38760ae4bd8974983a9d3..4ed24f85737baa9c3ea0c5f52e6c3eaa2d5cd5c9 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 e938edb86ccafcc5e7ccfc73ffd943ab21b1bc9e..505c6e08444fb9deb702a0ff424ee0b42762994b 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 ebbaf380f385832d6d655f8efa11d413c118f26b..b53d88d25fb4144a7515598c0f409966493771dc 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 95eddf823fa8ca0f806f9adfdc2767c42670ef89..88f673831c2be77048224eaca00c83e293db31e9 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 3eb5cb9ac2b338c8dc5eeec0d544f52b7a54e804..ad1e6d82521a964ad74504cb111d1b07838e14b4 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 1445e789972e500815e930bfbecae046926aadb1..c4ed1564a057dbd8b47e0abfecf1cb189be6dce9 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 0dcacc45a9b6b0fe261d16d369e74f24ef7ebdb7..7a316bcc788d3b1e9f40816f70f693e2000bbe99 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 5626d5e9edaa72beeda4af5cc53c19910a522c67..50f576b33fa395dbc61e89852c115372ea8f0314 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 462fd2a4b2c84e7e957056685d8578bc1465e0a9..74254a586e9d9e03730817804e03a13299167523 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 6e295b45bad358a4ecac884ba0f1c1921d65f95f..53db8ca2f5e06e6a732272f9454993f88e827a06 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 01748bb90722b5d7df2aa7b32fc741cfde1e4068..1791b4375088667e89c40ad025ff8118c562641d 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 58f90494c16b5e8c9c009af1e383814983573ed1..6d5e2556b3de6e4df884d73e5f85a622fb7f0f67 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 7dc9d2e9cf37102d6657c7eb01c57ba2ef65e61b..60969e7041c9c1f062039143d93cad665abaeb3f 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 9113d5e4e7a9e9b109cf6c3bcd887e0b43e55664..4d29e6aff7d583c1ecd9657ea7490825e03f6543 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 6c4e3183414ebf7cda9bcfe4b507e1457de95b88..ac7abb6a4fc2b80936f3e08d96ce534e56b0bfef 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 20c03a585a206d56cc4ae09aef17d50fb869845a..f330218f9a3e574dd346a5946c323da19e05960e 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 9481cd9f2e0210f82745176def589d4a62817b9a..938fe28c86ffc5848a42a3aa876b7e72e923b419 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 326ca69d663ce4b9e23538f1e705df86568c7c93..3ff7b56fa4d9c214502d4d532bd0dd55df3b48bd 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 e2df5f8258441c5b9763212e227fc986b969f93d..4caa3e1be728998f41d12814f5a77c602ce7ec72 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 d5a64150358b810d5c976e2b65770904ed0aa4bc..0d47c97815d046bb8342f80f22d0f855c38efbbc 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 37cb956c512054d1062db559032222f9a998e84e..370c5a864ed42a07e4b9c9bc0e95464efca4bb21 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 de6bb9b2e0cca34401fa2b9cb89724f6926d0d03..eb48a6bd6185f04a8af447ae082b3cfabb5e966d 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 8900eaace2638e577fe15abae4dab03ac4ab8a27..b2777b408f7fd2a3dc9d98c176b1ab0ec265a337 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 ccf0120d7b5259b3e7d3d7c236dcf7234ab397f0..5ed8c06b85f653a934106c55dcf6572c2b0e03c2 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 ed199871430a14ab672fbaccfc901e2db1eeb1a0..50c49bade9f2cfd6aa1ae5d937185233ae5acffd 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 6492ebd1db33c3d2adbdd2c6f14c6ebd6be99a8b..98cc3b50aa26d5539380d728c50f47fc2bcfd809 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 f47962e6d732e468fb8aa8b4ecc9f44fbf7ec82d..19c7fcc0624952e7fd69abde53069c0af6ccc020 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 d0b08c957dcc05bf850ac5b04f5ae9889e7ea119..caf67e00aa58a64d51d1a3b3e977e79d7d92863d 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 f4bb6cf62a8c14dd87463bed448a5180cfeea080..2dfd150e18c5afa5cc798548d3e31ae5c17fad95 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 ac89784dedc328bd1392a3ce22a656e60bc85fd6..db49a8852bdab54f6050b4d7abae9432769eee87 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 73b2a27d521d7989d9045b06d1780219f068920b..44da8df4496e80a8730d0cbc315b131e84e3dcfd 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 92d7eb59478f7eea2100480369d3c017c5a14c00..eceb90a482db0bc8ee01061fa9d4bcc87942a88b 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 cf612555a5f3eb0b43b4c3a912174ab16a004c19..4beb5643048ee21003f6fba180ce563dda4208cb 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 20e2bfc0117450f64b5d2003bcb36f192785ea9f..f415241dabfea211cc4e1e3faa2279b438ace69a 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 7826eeb32eb114ebd4c4814b45739792a00bd481..1331786c69f12ac2ba09df2bd3c7e5f6f1feb4dc 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 2f15d80c742dfec451a0145913cd81162ed8543a..8010501886c00d04dcb0882bf6b1b0acf1a1231d 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 ab95df0760ee888a57dbeed9487cd48bd35c74f2..371875fa0b85bd7cd981f08f9cbb4d83d909cae1 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 50c8e3defa0cbf1fbc5b34b152bdabc998052923..c2a3bd9c6267f1532c3057bb9d6254b29505ee24 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 4674d4f39bb8362bac521bcdb7ce10a7fd51f18e..e4f5fc154b0bdb2eb58bcdfdfbefb9d16371ef35 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 1b06f638293cf37b59578af96062905243f7ada1..389f3c0e7b0a0b6ce55656b80e15e745c30eee0c 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 0bb86eedfdf5d48cfb6fc7e1d3f46190e24053cc..83b1da785a3fd9c3dcc1bc397aac6250bff1053f 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 e919a0f605eb1733a273d1e5aa58f069ce70c058..d7f3c3ffdeb21a813e5d2e5db9a3519438d7a11f 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 0176397bc22235aa1c3644896d579162527f314d..edf52ffbfdb06988eddb825bc15f4cbdc5991dbc 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 cb0ec186e3f8a859ee39146b5af7fe0b26439c66..19a09a45f943258736f46d5e7aa914a70faac338 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 3a7f1aea8f959823ddc89b8b9be3a5222c05b37b..cb9153a0bafc918137e3b83e780201dc209467b1 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 605ed30900d10add5fa526e760c0108cfd9900f3..62b94edceae7e0434c70068c6b178d040f0022f7 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 94d6e6df269bab5a32bbf828cea1d479e3d47764..c2d8ba430b7be0b55f05f22e2f02d792a48dbcbe 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 5970cccc7115d3d81e46d8bf6b95eb3110ce51d5..b7252a11d7ad9e8c3c8a3e3cd618b378dca33088 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 887d2b690bf7f7842e0058ea5a61165b977762c1..e877166a251212331cd08c2f09d103fe13c1b3d2 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 f4c84a56c5cf12035cb99b19e65c97c7e6fca9a6..5c4f427e7937f235d91db85a6130bf327eafe3ec 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 90abca6dfb4a4c033147ebf41946be0c87b8d251..94f8f79153aa9539d59d6cd5307952082c1b6900 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 3658440da5b9d2d4fc32a529d3a9681d30fefef5..a26611801880f03e5c3936bcdfd32ad9ec869703 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 c5df1fe3548d8fd10805acfb16103f9388238c15..cbf5b2e5f7de1eac94d04b09b293a724cf7ae427 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 5a35b7fb9548d5d847b3bcc60a0004a009f55499..591be30265772addcd1f53d6f1ecf5cd7f7b77c3 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 9d694553d71ec21c19ea3905e07ef8f1405f24b1..06e3e7595a27c261b83fbe0bccc1090c454188da 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 1ffc104025ca2c90e846aa20a6658af86c135f26..6fac424f54897b1402efb7d931b93deb3608bf02 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 42ff59e6b2634d3c91d3804c0584ddab78251ef2..0ae3c73fd207ec26afb1c3de387966763e6ef7ba 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 dbcae0065cff8146896da9c4b5dcfa35802c97d1..1603c23cb468d8e948036f82a73b848fe918623d 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 e0bc9a39dc253cdacdb3ac68d8486d8603b28dad..3f45410510270144bb3f1e9153cacefd3fc1f4f5 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 bfbfc6048535e815a06a9349521de02d230475a7..6ed0f41a4655bdd91fa735b6766bfd0230f58f1b 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 2b186f11271121e0c960a32eab31d0b822f7faaa..58f1eecde7d5d290187b4f343ff338652be53489 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 7c4168838b64fb6dca79396bb4916fd023c84421..86885f513d860b188161bccf805803548c3ae47b 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 3b256eb6a9a36d0f8093d862e50fedb5680a4a11..7bb55b9f56bccf309edad06c5013ee9cdd822dd5 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 b5101d08a00cc1a07459b53cc9050550b4b60e70..747b733a9c62e31553dc6611c3d55f0e7ff76940 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 171f349343e1e6c31bc39cf0d49311496e45babd..9557cba7047ec21072aefcad11dc1c4317484880 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 7e797275101ae8cb1c469ae99328459d81eadc5e..f4c14d35690aa0a3cf2eaf15b0e2394de7651295 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 43a2be9b8f20733e3156165a29c031c6da1b1fbd..1f31497a530780460615a97ef304c5d1ad35e8f6 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 235d832d3c10aa860015439ed7c1c6104caf0924..d800deca65dd719eaf193ec5cd591e1df373018d 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 33a9b825227412bcae3256f6f5f1f8a2da645852..1c0af3449ac758f29c2a749b1bc38223c04ad1e3 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 84bad309a5a74116155b9965f695311937302388..50c76d3a16f858272db39d7fef805af9ba658ce7 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 b97667ecf9ed5638297f0e1041e2ffc2ed622780..a9fafeddb81355174310c563e98668fd25c0ddd9 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 6a0478caa885e0388214e699bb72db20958eff42..867fdcad6023f9c7ca833e1d17990c68c452ad78 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 e3bfb9faaeac6945aec70673900356c75adb737c..aed03b934358ef63c05b03f125d2a63f884fda46 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 448271e866a7b4eeeb732781260bb5cd56a5a0b5..abe5659c43ea729be6eaba18013b4018d1c15927 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 b142f678787220ed85ea6510b5921834508f41c6..d47267e4c4cbdb6b7e50da4902368cb0df1e56ea 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 ea2d0aa3aa704ecf988ddf693c1dfae79db9a550..4058a867d4ade70529f0bb1fd2a5672a87b0f126 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);
 }