diff --git a/index.php b/index.php
index c669fe7f6a81d0ef598a8fa9e6344c861a383273..77bde9a4f498877a8e07fa6d44617f84617878f7 100644
--- a/index.php
+++ b/index.php
@@ -8,9 +8,9 @@
  * @package Piwik
  */
 
-use Piwik\FrontController;
 use Piwik\Error;
 use Piwik\ExceptionHandler;
+use Piwik\FrontController;
 
 define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
diff --git a/piwik.php b/piwik.php
index a55d41a795d5c3cc779105292b05a57f1c33f66a..0b60462ecfcbbced804426bbb1e9404801aaa196 100644
--- a/piwik.php
+++ b/piwik.php
@@ -8,9 +8,9 @@
  * @package Piwik
  */
 
+use Piwik\Common;
 use Piwik\Timer;
 use Piwik\Tracker;
-use Piwik\Common;
 
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 $GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false;
diff --git a/tests/PHPUnit/BaseFixture.php b/tests/PHPUnit/BaseFixture.php
index a386123bd2bb8ea05401a538241da9d77534864c..04663d5bd2be72b80d4af71455158653f157e3ea 100644
--- a/tests/PHPUnit/BaseFixture.php
+++ b/tests/PHPUnit/BaseFixture.php
@@ -9,6 +9,7 @@ use Piwik\Access;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
+use Piwik\Db;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
@@ -18,7 +19,6 @@ use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\ReportRenderer;
 use Piwik\Site;
 use Piwik\Url;
-use Piwik\Db;
 
 /**
  * Base type for all integration test fixtures. Integration test fixtures
diff --git a/tests/PHPUnit/BenchmarkTestCase.php b/tests/PHPUnit/BenchmarkTestCase.php
index 9e26527b31f3191f256a36d253af21dca6f6e81d..2cd13cf675e5ea94142f6af175f566d368658231 100755
--- a/tests/PHPUnit/BenchmarkTestCase.php
+++ b/tests/PHPUnit/BenchmarkTestCase.php
@@ -7,7 +7,6 @@
  */
 use Piwik\Config;
 use Piwik\Db;
-use Piwik\Common;
 use Piwik\Plugins\Goals\API;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
diff --git a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
index 2d25e7d2866df64d63f8c17c9f9a1390b8d8884c..b15ec3068a442dc6bed4a55e32ea869d18e816ea 100644
--- a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
+++ b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php
@@ -7,8 +7,8 @@
  */
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\Period;
 use Piwik\Date;
+use Piwik\Period;
 use Piwik\Plugins\VisitsSummary\API;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/BenchmarkTestCase.php';
diff --git a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php
index ddf2ff8f7e407c1e52cc5f09586c3aa31121db72..3bba39cc861da34d22c10aacb761a65e61de1248 100755
--- a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php
+++ b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php
@@ -6,10 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\ArchiveProcessor\Rules;
-use Piwik\Common;
 use Piwik\Config;
-use Piwik\DbHelper;
 use Piwik\Db;
+use Piwik\DbHelper;
 
 /**
  * Reusable fixture. Loads a SQL dump into the DB.
diff --git a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php
index 17e649c01bd5cbd7e54776394ba35783cd743a09..6088787be4f928e2ba9709637488e0a10630a467 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php
@@ -6,7 +6,6 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\DataTable;
-use Piwik\DataTable\Filter\AddSummaryRow;
 use Piwik\DataTable\Row;
 
 class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php
index befee6e6364787adcc26a63f63cc0ad443c16722..c03c173c02d8c500211639455a37718177644e5d 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php
@@ -5,8 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\ExcludeLowPopulation;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php
index 7ca1a511b6ead4b0c967642a76513f831c739410..e2b8c46b34b969df2b8203cb1d649662e97e1c12 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php
@@ -5,8 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\Limit;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php
index 0119343a3b35825eccab47c002803d8adeb7e6d1..bb7f4ef0f880cf2b07bd815b9212be7bf8724d9e 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php
@@ -5,8 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\RangeCheck;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php
index 6f18e5d8dd6bec0874231f5a0e07162fc29dcae6..96a642efeb7466d4d5aadfcd1d926a113a6d94a3 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php
@@ -5,8 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\Sort;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
index 509a3fc87e1472d4e72d7c171166126eecadb942..5be7e738e1c2eef52bd5bb38772099118c2e7067 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
+++ b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
@@ -5,8 +5,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\Truncate;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/MapTest.php b/tests/PHPUnit/Core/DataTable/MapTest.php
index 94c3a85312b6c6ded655dffa14ccfca6865caa34..de08a1478726ff388de209ef74fc4c66dfbcf897 100644
--- a/tests/PHPUnit/Core/DataTable/MapTest.php
+++ b/tests/PHPUnit/Core/DataTable/MapTest.php
@@ -1,7 +1,7 @@
 <?php
 use Piwik\Config;
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class Test_DataTable_Map extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
index f5f37f2ef8cab9e9254eef355840617d177167e0..3efe5ca7751cf90ae48fa9f6c2d28dc3f96d006a 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
@@ -5,11 +5,11 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Csv;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
+use Piwik\DataTable\Simple;
 
 class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
index 79107f4cf3fbdd64233c23078a3b1720210dc0fe..40fe748afe6e1b533f6cd47389a7256aa5013277 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
@@ -5,9 +5,9 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Console;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
index 565bbb09f0fc0eeb1d808654f4ae4c5326026626..6c74f07bb4bd63081bcd89722e7659df3f45a971 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
@@ -5,11 +5,11 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Json;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
+use Piwik\DataTable\Simple;
 
 class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
index 25508763296cbfe9b1e3375f2fa332e5cd8ecab5..c7af2683a680c7379a182edea852f735adc054ec 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
@@ -5,11 +5,11 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Php;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
+use Piwik\DataTable\Simple;
 
 class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
index 99b9d2048067eda368867b7f23083f7940acf060..d563c64eca12b804fa8885ca9e2be0338dfdddfe 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
@@ -5,11 +5,11 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Xml;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
+use Piwik\DataTable\Simple;
 
 class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php
index 7b4b06aa185f157daf44f62987c1304ee27585f5..0eee3c7a777bd72bdb800ce54a300e7b33992f24 100644
--- a/tests/PHPUnit/Core/DataTableTest.php
+++ b/tests/PHPUnit/Core/DataTableTest.php
@@ -7,8 +7,8 @@
  */
 
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Timer;
 
diff --git a/tests/PHPUnit/Core/LogTest.php b/tests/PHPUnit/Core/LogTest.php
index 7b2b3b8c11ac94eabfe1abd48c92389bd6728b0d..484a2269baa3c76aab8f6d720bc8933b791a21b9 100644
--- a/tests/PHPUnit/Core/LogTest.php
+++ b/tests/PHPUnit/Core/LogTest.php
@@ -5,14 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Error;
-use Piwik\Config;
-use Piwik\Log;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Db;
+use Piwik\Error;
 use Piwik\ExceptionHandler;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
+use Piwik\Log;
 use Piwik\Plugins\TestPlugin\TestLoggingUtility;
 
 class LogTest extends DatabaseTestCase
diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Core/MetricsTest.php
index 4ceba82f57ca06e84712f828c6113261734e2386..21027dd61db77df9229718c992ddbb33ad17a6f9 100644
--- a/tests/PHPUnit/Core/MetricsTest.php
+++ b/tests/PHPUnit/Core/MetricsTest.php
@@ -1,7 +1,6 @@
 <?php
-use Piwik\Metrics;
-use Piwik\Plugins\SitesManager\API;
 use Piwik\Access;
+use Piwik\Metrics;
 
 /**
  * Piwik - Open source web analytics
diff --git a/tests/PHPUnit/Core/OptionTest.php b/tests/PHPUnit/Core/OptionTest.php
index 982ada567c3310b2eb57a48a233771f0f721443b..15db913bc0e1bfa64574793872c6c833c5f77db3 100644
--- a/tests/PHPUnit/Core/OptionTest.php
+++ b/tests/PHPUnit/Core/OptionTest.php
@@ -6,8 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\Common;
-use Piwik\Option;
 use Piwik\Db;
+use Piwik\Option;
 
 require_once "Option.php";
 
diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Core/Period/RangeTest.php
index ab8020730bc395ddebe0aeb91a79ef009c28fc66..680774756399dc6629b82c64fc5276684d15dc4c 100644
--- a/tests/PHPUnit/Core/Period/RangeTest.php
+++ b/tests/PHPUnit/Core/Period/RangeTest.php
@@ -5,11 +5,11 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+use Piwik\Date;
 use Piwik\Period\Month;
-use Piwik\Period\Year;
-use Piwik\Period\Week;
 use Piwik\Period\Range;
-use Piwik\Date;
+use Piwik\Period\Week;
+use Piwik\Period\Year;
 use Piwik\Translate;
 
 class Period_RangeTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php
index c9ebcd11ef87ffb96cb5b93f29287261fe73d081..8839090f3d1ff5baea1fadcb92019e6b0b98f33a 100644
--- a/tests/PHPUnit/Core/PeriodTest.php
+++ b/tests/PHPUnit/Core/PeriodTest.php
@@ -5,12 +5,12 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Period;
 use Piwik\Date;
-use Piwik\Period\Month;
 use Piwik\Period\Day;
-use Piwik\Period\Year;
+use Piwik\Period\Month;
 use Piwik\Period\Week;
+use Piwik\Period;
+use Piwik\Period\Year;
 
 class PeriodTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/RegistryTest.php b/tests/PHPUnit/Core/RegistryTest.php
index f3a4fd01bdf309937393c5ba96d6f70130452fc4..ac7757e036b1d24bb80074a3d7844f603f0c53e3 100644
--- a/tests/PHPUnit/Core/RegistryTest.php
+++ b/tests/PHPUnit/Core/RegistryTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use \Piwik\Registry;
+use Piwik\Registry;
 
 class RegistryTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/SegmentTest.php b/tests/PHPUnit/Core/SegmentTest.php
index d48f77104e7e012fef6d3ce4ca0119f4b6a68ee0..f611dcee0a8a818b5cc9111d7bf17e87d9825a96 100644
--- a/tests/PHPUnit/Core/SegmentTest.php
+++ b/tests/PHPUnit/Core/SegmentTest.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Common;
 use Piwik\Access;
+use Piwik\Common;
 use Piwik\Segment;
 
 /**
diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php
index 60c5f5421a7926bd2d641fcad7ade191f5fa6727..31b525acaa55fe3b434b43b2a3bc35cfd7e9b3f0 100644
--- a/tests/PHPUnit/Core/TaskSchedulerTest.php
+++ b/tests/PHPUnit/Core/TaskSchedulerTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\EventDispatcher;
+use Piwik\ScheduledTask;
 use Piwik\ScheduledTime\Daily;
 use Piwik\TaskScheduler;
-use Piwik\ScheduledTask;
 
 class TaskSchedulerTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Core/Tracker/ActionTest.php b/tests/PHPUnit/Core/Tracker/ActionTest.php
index 8c66c4bb4af632c7efbbc0643f8f6997136b0a88..9c03119c662683eb78287c6737bdd3b0c47e1b6d 100644
--- a/tests/PHPUnit/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Core/Tracker/ActionTest.php
@@ -4,7 +4,6 @@ use Piwik\Config;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
-use Piwik\Tracker\TableLogAction;
 use Piwik\Tracker\Request;
 use Piwik\Translate;
 
diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Core/Tracker/VisitTest.php
index 865c0ec0c1010e8eb6a1320f3f9ae9c9931d9df9..f95fabc133d6cdb5ed41c808e253301472c42de4 100644
--- a/tests/PHPUnit/Core/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Core/Tracker/VisitTest.php
@@ -8,8 +8,8 @@
 use Piwik\Access;
 use Piwik\IP;
 use Piwik\Plugins\SitesManager\API;
-use Piwik\Tracker\VisitExcluded;
 use Piwik\Tracker\Request;
+use Piwik\Tracker\VisitExcluded;
 
 class Tracker_VisitTest extends DatabaseTestCase
 {
diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Core/Translate/WriterTest.php
index 717d54285c0ad38cd687c5ba37189a6b2a9dc550..d6a05c2ed723604689b7d04e6d49e1098e9a890a 100644
--- a/tests/PHPUnit/Core/Translate/WriterTest.php
+++ b/tests/PHPUnit/Core/Translate/WriterTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use Piwik\Translate\Writer;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
 use Piwik\Translate\Filter\ByBaseTranslations;
 use Piwik\Translate\Filter\ByParameterCount;
 use Piwik\Translate\Filter\UnnecassaryWhitespaces;
+use Piwik\Translate\Validate\CoreTranslations;
+use Piwik\Translate\Validate\NoScripts;
+use Piwik\Translate\Writer;
 
 /**
  * Piwik - Open source web analytics
diff --git a/tests/PHPUnit/Core/UnzipTest.php b/tests/PHPUnit/Core/UnzipTest.php
index 3390ffb36378e3dc529baacf36a6f7b1a67e5699..df4fb87860e7859f6a21edd56c9c4474c37ebec2 100644
--- a/tests/PHPUnit/Core/UnzipTest.php
+++ b/tests/PHPUnit/Core/UnzipTest.php
@@ -5,11 +5,11 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Unzip;
 use Piwik\Unzip\Gzip;
 use Piwik\Unzip\PclZip;
-use Piwik\Unzip\ZipArchive;
 use Piwik\Unzip\Tar;
+use Piwik\Unzip;
+use Piwik\Unzip\ZipArchive;
 
 class UnzipTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index 579d75560d1839ae12977955a39d31e821619db0..da583e86ee321f16392245a641decbb2db87c85e 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -8,8 +8,8 @@
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\DataTable\Manager;
-use Piwik\DbHelper;
 use Piwik\Db;
+use Piwik\DbHelper;
 use Piwik\Option;
 use Piwik\Plugins\ScheduledReports\API;
 use Piwik\Site;
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index 617fc5239ff503781635395bf09320f1547369fb..f3cefcd575b83d905e3e6b6eb38f53c881953f4b 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -6,13 +6,13 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\Common;
+use Piwik\Date;
+use Piwik\Db;
 use Piwik\FrontController;
 use Piwik\Plugins\Annotations\API as APIAnnotations;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\WidgetsList;
-use Piwik\Date;
-use Piwik\Db;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php';
 
diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php
index bdefb387951fa8ce7a8de07f11f3603f47434346..1692c269028eca9e54d55d30ca8962fec5ed7de0 100755
--- a/tests/PHPUnit/Integration/AnnotationsTest.php
+++ b/tests/PHPUnit/Integration/AnnotationsTest.php
@@ -6,8 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\API\Request;
 use Piwik\Access;
+use Piwik\API\Request;
 use Piwik\Plugins\Annotations\API;
 
 class AnnotationsTest extends IntegrationTestCase
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
index 6776837a138dc4d02d37fc6b9b1c8844a36e7ad7..54dde82034bf252f8f305fd9b68c4320ad97d92a 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -5,8 +5,8 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Piwik;
 use Piwik\Date;
+use Piwik\Piwik;
 
 /**
  * Tests API methods after ecommerce orders are tracked.
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
index 81218bec8e2fe580441f144963df7e56f1b74455..124c76044f82f85c6080a1a76ae2c124f5c211d9 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
@@ -5,9 +5,9 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Db;
+use Piwik\Piwik;
 
 /**
  * Tests some API using range periods & makes sure the correct amount of blob/numeric
diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php
index 709b5deb1da7ff9f6f871b6cf26c48906a101ca0..608681348abe4b7f245b6db55480c7d8ab287489 100644
--- a/tests/PHPUnit/Integration/UrlNormalizationTest.php
+++ b/tests/PHPUnit/Integration/UrlNormalizationTest.php
@@ -1,7 +1,7 @@
 <?php
 use Piwik\Common;
-use Piwik\Tracker\Action;
 use Piwik\Db;
+use Piwik\Tracker\Action;
 
 /**
  * Tests the URL normalization.
diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
index d410dc1f359be81700be69f111d0408013b3117d..f38d8b53aad197da81457d5fec10494961f69d44 100755
--- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php
+++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
@@ -7,15 +7,14 @@
  */
 use Piwik\Common;
 use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Writer;
-use Piwik\Plugin\Manager;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Validate\CoreTranslations;
 use Piwik\Translate\Filter\ByBaseTranslations;
 use Piwik\Translate\Filter\ByParameterCount;
 use Piwik\Translate\Filter\EmptyTranslations;
 use Piwik\Translate\Filter\EncodedEntities;
 use Piwik\Translate\Filter\UnnecassaryWhitespaces;
+use Piwik\Translate\Validate\CoreTranslations;
+use Piwik\Translate\Validate\NoScripts;
+use Piwik\Translate\Writer;
 
 require_once 'LanguagesManager/API.php';
 
diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/tests/PHPUnit/Plugins/ReferrersTest.php
index f4abb76b59691d12afaa4988725964f9539a8906..9017e8cf0f3b193a5fc7648b3ea2515b62bda1db 100644
--- a/tests/PHPUnit/Plugins/ReferrersTest.php
+++ b/tests/PHPUnit/Plugins/ReferrersTest.php
@@ -7,13 +7,9 @@
  */
 require_once 'Referrers/Referrers.php';
 
-use Piwik\Date;
-use Piwik\Period;
-use Piwik\Segment;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\DataAccess\ArchiveWriter;
-use Piwik\ArchiveProcessor\Rules;
+use Piwik\Period;
 
 class ReferrersTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Plugins/ScheduledReportsTest.php
index a15f2cdb9c8f3da2f0d198ad1b1703fe3116ea4e..bbf0b267300efcf421cf044cd33cfdd08488cf78 100644
--- a/tests/PHPUnit/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Plugins/ScheduledReportsTest.php
@@ -11,9 +11,9 @@ use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\ScheduledTime;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTime\Daily;
+use Piwik\ScheduledTime;
 use Piwik\ScheduledTime\Monthly;
 use Piwik\Site;
 
diff --git a/tests/PHPUnit/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Plugins/SegmentEditorTest.php
index 9d0f36d878d5071e805606064b975443698d3ecc..ec2038f2f755427fd313642b5d05d977c1f13027 100644
--- a/tests/PHPUnit/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Plugins/SegmentEditorTest.php
@@ -5,9 +5,9 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Piwik;
 use Piwik\Access;
 use Piwik\Date;
+use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index 74c851f2c082310166ec4e395e76d5edcad4c30d..0b59eb0ea32cf0758f5426a2384f6043527bc765 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
 use Piwik\Plugins\UserCountry;
 use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
diff --git a/tests/PHPUnit/Plugins/UsersManagerTest.php b/tests/PHPUnit/Plugins/UsersManagerTest.php
index 00e21ec46cf661f4835465a52272825809c599db..d1ed6313281cd3b535ce921ded2e9f88d542b3e0 100644
--- a/tests/PHPUnit/Plugins/UsersManagerTest.php
+++ b/tests/PHPUnit/Plugins/UsersManagerTest.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Config;
 use Piwik\Access;
+use Piwik\Config;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API;
 
diff --git a/tests/PHPUnit/UITest.php b/tests/PHPUnit/UITest.php
index 380511caffa6a401534ed875ee907ee05c1d8764..ad2206b7bb30a11d3e82f88472224c77c98e9021 100644
--- a/tests/PHPUnit/UITest.php
+++ b/tests/PHPUnit/UITest.php
@@ -8,9 +8,9 @@
 use Piwik\Access;
 use Piwik\AssetManager;
 use Piwik\Date;
+use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Plugins\VisitsSummary\API;
-use Piwik\Db;
 
 abstract class UITest extends IntegrationTestCase
 {
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index dce8607cff88a6b9a05a169716a2bd697a81f948..3679cdd7a9887ff386f2e7c2bcae1b646e177455 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -13,8 +13,8 @@ use Piwik\Config;
 use Piwik\DataTable\Manager;
 use Piwik\Option;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Tracker;
 use Piwik\Site;
+use Piwik\Tracker;
 use Piwik\Tracker\Cache;