diff --git a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php
index 79c6f5ec436160e06eb713287d2f19aea9db78dc..176221fcff5264ea4764cf33bf3596bb7852bfb3 100644
--- a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php
+++ b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php
@@ -6,8 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomVariables\tests;
+namespace Piwik\Plugins\CustomVariables\tests\System;
 
+use Piwik\Plugins\CustomVariables\tests\Fixtures\VisitWithManyCustomVariables;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 
 /**
@@ -18,7 +19,7 @@ use Piwik\Tests\Framework\TestCase\SystemTestCase;
 class CustomVariablesSystemTest extends SystemTestCase
 {
     /**
-     * @var Fixtures\VisitWithManyCustomVariables
+     * @var VisitWithManyCustomVariables
      */
     public static $fixture = null; // initialized below class definition
 
@@ -57,4 +58,4 @@ class CustomVariablesSystemTest extends SystemTestCase
     }
 }
 
-CustomVariablesSystemTest::$fixture = new Fixtures\VisitWithManyCustomVariables();
\ No newline at end of file
+CustomVariablesSystemTest::$fixture = new VisitWithManyCustomVariables();
\ No newline at end of file
diff --git a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
index b41632ba6df58c4877da275798e00b29fe6c2941..755ce0be82edf2542cdfc847484e8ed02fcaaf2e 100644
--- a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
+++ b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
-namespace Piwik\Plugins\UserCountry\Test\Integration;
+namespace Piwik\Plugins\UserCountry\Test\System;
 
 use Piwik\Common;
 use Piwik\Db;
diff --git a/tests/PHPUnit/System/CliMultiTest.php b/tests/PHPUnit/System/CliMultiTest.php
index c98714d3cc519f03e3ec0b684782136724bd1103..55e95e0066e69032374f4437f2a1a68be3e40dbd 100644
--- a/tests/PHPUnit/System/CliMultiTest.php
+++ b/tests/PHPUnit/System/CliMultiTest.php
@@ -5,6 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+namespace Piwik\Tests\System;
 
 use Piwik\Archiver\Request;
 use Piwik\CliMulti;
diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php
similarity index 100%
rename from tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
rename to tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php