diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
index d540b750f3605abdae60778a21d8c789d7d929d8..6b24e00c6aff3ae1a17115616d9808210eb8ade0 100644
--- a/core/API/DataTableGenericFilter.php
+++ b/core/API/DataTableGenericFilter.php
@@ -10,8 +10,8 @@ namespace Piwik\API;
 
 use Exception;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
+use Piwik\DataTable;
 
 class DataTableGenericFilter
 {
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 0c19cc844a3a97b13346f55c87dd9a125a330c0e..5ebdd2fbcf63654615c585f1fb85d0ebdebdfbd2 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -11,8 +11,8 @@ namespace Piwik\API;
 use Exception;
 use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Period\Range;
 use Piwik\Plugins\API\API;
 
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
index 9d1d53d0893ae23901ba1326f25de88c0c9e2628..20fe2c028fbee6be7b3f19e978a7645685b0bbdf 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -10,8 +10,8 @@ namespace Piwik\API\DataTableManipulator;
 
 use Piwik\API\DataTableManipulator;
 use Piwik\Common;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 
 /**
  * This class is responsible for flattening data tables.
diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
index c2075b1efecaaefcdac44ff4104cefc5421a7e39..05c594b35a57b393cb22e974f9a504da123bfbcd 100644
--- a/core/API/DataTableManipulator/LabelFilter.php
+++ b/core/API/DataTableManipulator/LabelFilter.php
@@ -10,8 +10,8 @@ namespace Piwik\API\DataTableManipulator;
 
 use Piwik\API\DataTableManipulator;
 use Piwik\Common;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 
 /**
  * This class is responsible for handling the label parameter that can be
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 255944bdbe3b4dd442db8a0a2f426671db7ac3c8..692a2ceb71034fe5863725787dbeab29402c047d 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -13,10 +13,10 @@ use Piwik\API\DataTableManipulator\Flattener;
 use Piwik\API\DataTableManipulator\LabelFilter;
 use Piwik\API\DataTableManipulator\ReportTotalsCalculator;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Json;
 use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
+use Piwik\DataTable;
 
 /**
  */
diff --git a/core/AssetManager.php b/core/AssetManager.php
index 8df4be83ddaf3e2555a1eafe928fb7a8d8f1ea35..c026be4ba2933a72b752e86de811a3364059c99d 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -9,14 +9,14 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAsset\InMemoryUIAsset;
 use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
-use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAssetCacheBuster;
-use Piwik\AssetManager\UIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher\JScriptUIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher\StylesheetUIAssetFetcher;
+use Piwik\AssetManager\UIAssetFetcher;
 use Piwik\AssetManager\UIAssetMerger\JScriptUIAssetMerger;
 use Piwik\AssetManager\UIAssetMerger\StylesheetUIAssetMerger;
 use Piwik\Config as PiwikConfig;
diff --git a/core/AssetManager/UIAssetMerger.php b/core/AssetManager/UIAssetMerger.php
index 8ac12365fc6efeb0792fc31f7740b39206e0d600..fd98da90725e6e7a42b4a4e296409d87c9a460b4 100644
--- a/core/AssetManager/UIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\AssetManager;
 
-use Piwik\AssetManager;
 use Piwik\AssetManager\PiwikLessCompiler;
 use Piwik\AssetManager\UIAsset\StylesheetUIAsset;
+use Piwik\AssetManager;
 
 abstract class UIAssetMerger
 {
diff --git a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
index 3cd57f11d0ac0738a861e03aa90f4b67ab348378..93b7d7bf6d85ea762c17821aede618cd9bcd5d91 100644
--- a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
@@ -10,9 +10,9 @@ namespace Piwik\AssetManager\UIAssetMerger;
 
 use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAssetCacheBuster;
-use Piwik\AssetManager;
 use Piwik\AssetManager\UIAssetFetcher\JScriptUIAssetFetcher;
 use Piwik\AssetManager\UIAssetMerger;
+use Piwik\AssetManager;
 use Piwik\AssetManager\UIAssetMinifier;
 use Piwik\Piwik;
 
diff --git a/core/Common.php b/core/Common.php
index 907877b4002ef37413d1938fd4654990bac21413..876f6ff8e86101227eccbfa32cb01376b43a9458 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -10,8 +10,8 @@ namespace Piwik;
 
 use Exception;
 use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
-use Piwik\Tracker\Cache;
 use Piwik\Tracker;
+use Piwik\Tracker\Cache;
 
 /**
  * Contains helper methods used by both Piwik Core and the Piwik Tracking engine.
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index c24c0fb52a27638814c9238cd28fa004ca9f935e..be580b00f69d1784d8a51cc3bbc6619e848deec0 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -9,14 +9,14 @@
 namespace Piwik\DataAccess;
 
 use Exception;
-use Piwik\ArchiveProcessor;
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Log;
-use Piwik\Period\Range;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Segment;
 
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 1563a639c96bbeda07ef249322db1c37210f123b..bab3b26bdd45a53f9e6baaf18a992be1c31bbc5e 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataAccess;
 
 use Exception;
-use Piwik\ArchiveProcessor;
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Db\BatchInsert;
diff --git a/core/DataTable.php b/core/DataTable.php
index 0fa7e67ef1e19daa70b7b0ce0145e3611cda7957..81eeaff4fef19b64734e2193958fa12d73ab1746 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -14,8 +14,8 @@ use Exception;
 use Piwik\DataTable\DataTableInterface;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Html;
-use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\DataTable\Row;
+use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable\TableNotFoundException;
 use ReflectionClass;
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index e60d3fa6af7b220b3e2e44d4cef0730b441b8701..cd6629f8b0055961f4bb1c00ebce7c13d3c64402 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Metrics;
 
 /**
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index 2417aa9dd642c8828ca05b49b91c5f538bd2b607..fd842ad0ff114f8ca1c3f9aaae4f843b85cc3800 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable;
 use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Simple;
+use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Tracker\GoalManager;
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index f3c9e979929f4099bdf15b5623a42e00a86e1ac0..b89a306a1a599956db1f11e605d3c6f4f4ceab1c 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable\Manager;
 use Piwik\DataTable;
+use Piwik\DataTable\Manager;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 7050a3eb7b6098a50c4d107af071ace40175fd82..fbef2d91b9fa0e75f9c29a30e8ec4acbac100bc7 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -9,9 +9,9 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
+use Piwik\DataTable;
 use Piwik\Metrics;
 
 /**
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 651a3f7564560c40e23210b555f3863be1699f98..fa5389650b4adfa2857a4198f899581b409b09ed 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
index 51355af56c91ec42d054801c9f30508ac80f16fd..7985afb1d88e6ad58adf3e03823edc6ec318d449 100644
--- a/core/DataTable/Map.php
+++ b/core/DataTable/Map.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable;
 
 use Piwik\Common;
-use Piwik\DataTable\Renderer\Console;
 use Piwik\DataTable;
+use Piwik\DataTable\Renderer\Console;
 
 /**
  * Stores an array of {@link DataTable}s indexed by one type of {@link DataTable} metadata (such as site ID
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 58ef0f156aef174198be7530e1366ee27783b468..75d6d68fc084f4ecdf5a754d122b3019ff4d06df 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -13,8 +13,8 @@ use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable;
 use Piwik\Date;
-use Piwik\Period\Range;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\ProxyHttp;
 
diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php
index 931831b3339c1b29b836712a6f0a7c26a992dd7b..ca4cd653ee5998a80e964fe9c44a2b5f8123faa1 100644
--- a/core/DataTable/Renderer/Html.php
+++ b/core/DataTable/Renderer/Html.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Renderer;
 
 use Exception;
-use Piwik\DataTable\Renderer;
 use Piwik\DataTable;
+use Piwik\DataTable\Renderer;
 
 /**
  * Simple HTML output
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index cbc71a038c6826db5482474f3563ec995a7f2296..80e49bc22d24af4476c147b552d0c868709dac1d 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -10,9 +10,9 @@ namespace Piwik\DataTable\Renderer;
 
 use Exception;
 use Piwik\DataTable\Manager;
-use Piwik\DataTable;
 use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
+use Piwik\DataTable;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index c23594c3ebbceeaa5c2bce50a26bd9e4c3b8b2cf..f5c98ee7006387eb02fefccb2517e62bdb65e660 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -11,8 +11,8 @@ namespace Piwik\DataTable\Renderer;
 use Exception;
 use Piwik\Archive;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Renderer;
+use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\SettingsPiwik;
 
diff --git a/core/Piwik.php b/core/Piwik.php
index be3193b344d175f8b361552567f891082be051c8..597578068624d6005c54d000d996cae338740a92 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -9,9 +9,9 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\Db;
 use Piwik\Db\Adapter;
 use Piwik\Db\Schema;
+use Piwik\Db;
 use Piwik\Plugin;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index bf140e0b563878eed50e8ec4c832b6d43de31c90..3e6d4a8e119ead7937eb19f49f2ba37682de8fe5 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -13,17 +13,17 @@ use Piwik\Access;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Config as PiwikConfig;
+use Piwik\Config;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\Date;
 use Piwik\FrontController;
 use Piwik\Menu\MenuTop;
 use Piwik\NoAccessException;
 use Piwik\Notification\Manager as NotificationManager;
-use Piwik\Period\Range;
-use Piwik\Period;
 use Piwik\Period\Month;
+use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
@@ -34,8 +34,8 @@ use Piwik\Registry;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Url;
-use Piwik\View\ViewInterface;
 use Piwik\View;
+use Piwik\View\ViewInterface;
 use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
 
 /**
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 4574865238f38cd5e67211182fc4362ff7553fca..56051341ab28082c85dfe01a422d167cfc49c607 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -8,12 +8,12 @@
  */
 namespace Piwik\Plugin;
 
-use Piwik\Config;
 use Piwik\Config as PiwikConfig;
+use Piwik\Config;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
-use Piwik\Notification\Manager as NotificationManager;
 use Piwik\Notification;
+use Piwik\Notification\Manager as NotificationManager;
 use Piwik\Piwik;
 use Piwik\Url;
 use Piwik\Version;
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 047464551c305eba5d1ec294c25374d500ccccff..f1aab50895a1e1ca2974729abb9a2bdc2895f465 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -10,8 +10,8 @@
 namespace Piwik\Plugin;
 
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Config as PiwikConfig;
+use Piwik\Config;
 use Piwik\EventDispatcher;
 use Piwik\Filesystem;
 use Piwik\Option;
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index f6d4365ea6364cabb58681435f396b9d4077062c..1643fd03ee3d2d867c748ef9124b2c3621cc2b6d 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -13,8 +13,8 @@ use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\View\ViewInterface;
 use Piwik\View;
+use Piwik\View\ViewInterface;
 use Piwik\ViewDataTable\Config as VizConfig;
 use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 use Piwik\ViewDataTable\Request as ViewDataTableRequest;
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php
index 8105b98d75264589618aaab52166b38ec8b1012b..4634f9197c891c38e3d1c54f256e3a55cdda6e9c 100644
--- a/core/ReportRenderer.php
+++ b/core/ReportRenderer.php
@@ -11,8 +11,8 @@ namespace Piwik;
 use Exception;
 use Piwik\API\Request;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\DataTable\Simple;
+use Piwik\DataTable;
 use Piwik\Plugins\ImageGraph\API;
 
 /**
diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php
index eb1fde8400b04396d0d31d4395bcacaec16c933c..3a2e04abfde6a05cde1e9c435427fb38d535a518 100644
--- a/core/Tracker/Db/Pdo/Mysql.php
+++ b/core/Tracker/Db/Pdo/Mysql.php
@@ -12,8 +12,8 @@ use Exception;
 use PDO;
 use PDOException;
 use PDOStatement;
-use Piwik\Tracker\Db\DbException;
 use Piwik\Tracker\Db;
+use Piwik\Tracker\Db\DbException;
 
 /**
  * PDO MySQL wrapper
diff --git a/core/Updates/2.1.1-b11.php b/core/Updates/2.1.1-b11.php
index 3d545466944ef69e047e1c9ea4d8e1df8bc892dc..18908cc30ee50879031763541cb140375f2bbea6 100644
--- a/core/Updates/2.1.1-b11.php
+++ b/core/Updates/2.1.1-b11.php
@@ -10,8 +10,8 @@ namespace Piwik\Updates;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveWriter;
 use Piwik\Date;
-use Piwik\Db;
 use Piwik\Db\BatchInsert;
+use Piwik\Db;
 use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
 use Piwik\Segment;
 use Piwik\Updater;
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 5b64d36811e5685e194672152430c1cc67c7466e..7f81bc97af996f175444e96a5bfcf193925b6063 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 5b64d36811e5685e194672152430c1cc67c7466e
+Subproject commit 7f81bc97af996f175444e96a5bfcf193925b6063
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index 6f49212ee144abe9c67d01d1b61afe1d7b1fb10e..01566cce27632c48512128a213535ddf27d8618a 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit 6f49212ee144abe9c67d01d1b61afe1d7b1fb10e
+Subproject commit 01566cce27632c48512128a213535ddf27d8618a
diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php
index 4e3406edf24e298b5e6d7e00e149520302aba45e..787dc427093597715b33ed42aab4aa85ac90da56 100644
--- a/tests/PHPUnit/Core/AssetManagerTest.php
+++ b/tests/PHPUnit/Core/AssetManagerTest.php
@@ -5,13 +5,13 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\AssetManager;
 use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
 use Piwik\AssetManager\UIAsset;
+use Piwik\AssetManager;
 use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
 use Piwik\Config;
-use Piwik\Plugin\Manager;
 use Piwik\Plugin;
+use Piwik\Plugin\Manager;
 
 require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php";
 require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php";
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
index 3efe5ca7751cf90ae48fa9f6c2d28dc3f96d006a..fd7217f7b3b4e061f83d87c9b457adb82525b2f8 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Csv;
 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 40fe748afe6e1b533f6cd47389a7256aa5013277..d78d70d35f501189701d6886f962fca184a96618 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
@@ -6,8 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\DataTable\Manager;
-use Piwik\DataTable\Renderer\Console;
 use Piwik\DataTable;
+use Piwik\DataTable\Renderer\Console;
 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 6c74f07bb4bd63081bcd89722e7659df3f45a971..a30b2dc523b21848de7201216570845848758a89 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Json;
 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 c7af2683a680c7379a182edea852f735adc054ec..fda6fcda2e033abf6b8437c68a24db675d7eb5ee 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Php;
 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 d563c64eca12b804fa8885ca9e2be0338dfdddfe..c3a0e99fffebc4438b28fdda9bd7aca4b32cc544 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Xml;
 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 d82a876c0159b96561bf22f7cff7b1d049b6633f..cf4c0048f75670e1160286fa3a4eee03ecadc07c 100644
--- a/tests/PHPUnit/Core/DataTableTest.php
+++ b/tests/PHPUnit/Core/DataTableTest.php
@@ -8,8 +8,8 @@
 
 use Piwik\Common;
 use Piwik\DataTable\Manager;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Timer;
 
 class DataTableTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DependencyTest.php b/tests/PHPUnit/Core/DependencyTest.php
index 3bd1bd579379abba74aa8998bdaaf4a3f4aa436a..f6e1ad15b37e880cc9e3b2b7a4fbec325248a0ea 100644
--- a/tests/PHPUnit/Core/DependencyTest.php
+++ b/tests/PHPUnit/Core/DependencyTest.php
@@ -1,7 +1,7 @@
 <?php
 use Piwik\Plugin\Dependency;
-use Piwik\Version;
 use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Version;
 
 /**
  * Piwik - Open source web analytics
diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
index 313f552e437a490a56db700b49d9f1756f228bf3..148b3489a89d05eb31046b354f1b1d2154f89fe2 100644
--- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
@@ -6,11 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\AssetManager;
-use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
 use Piwik\AssetManager\UIAsset;
-use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
-use Piwik\Config;
-use Piwik\Plugin\Manager;
 use Piwik\Plugin;
 
 /**
diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php
index f8321377d0125948719ce8124a8765ff3550b8c2..74953436f472c8b75fb7a9b2b410aafea14b26ce 100644
--- a/tests/PHPUnit/Core/PeriodTest.php
+++ b/tests/PHPUnit/Core/PeriodTest.php
@@ -7,9 +7,9 @@
  */
 use Piwik\Date;
 use Piwik\Period\Day;
+use Piwik\Period;
 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/ScheduledTime/DailyTest.php b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
index a63302cffca88b7053c527e00f38f08b88ce80a3..dde7ae8e309c596bce46de60e52ccaf5b189dde3 100644
--- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
+++ b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
@@ -5,7 +5,6 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\ScheduledTime\Daily;
 
 /**
  * @group Core
diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php
index c6f937a6c3f1c9235b9d58911bb6be8ae6d49c74..9c112a4da46bfb6f8746f1dd91df523e9638e835 100644
--- a/tests/PHPUnit/Core/TaskSchedulerTest.php
+++ b/tests/PHPUnit/Core/TaskSchedulerTest.php
@@ -8,7 +8,6 @@
 use Piwik\EventDispatcher;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTaskTimetable;
-use Piwik\ScheduledTime\Daily;
 use Piwik\TaskScheduler;
 
 class TaskSchedulerTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/UnzipTest.php b/tests/PHPUnit/Core/UnzipTest.php
index df4fb87860e7859f6a21edd56c9c4474c37ebec2..099ee106806451d8198eb9a62d804735dc857159 100644
--- a/tests/PHPUnit/Core/UnzipTest.php
+++ b/tests/PHPUnit/Core/UnzipTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 use Piwik\Unzip\Gzip;
+use Piwik\Unzip;
 use Piwik\Unzip\PclZip;
 use Piwik\Unzip\Tar;
-use Piwik\Unzip;
 use Piwik\Unzip\ZipArchive;
 
 class UnzipTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php
index bf809994eda8945a535ecf363c585e088623e8ad..55651c4dcfa1419a881580546b537f96ba7fa1ea 100644
--- a/tests/PHPUnit/Core/UrlTest.php
+++ b/tests/PHPUnit/Core/UrlTest.php
@@ -1,7 +1,6 @@
 <?php
 use Piwik\Config;
 use Piwik\Url;
-use Piwik\UrlHelper;
 
 /**
  * Piwik - Open source web analytics
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index eea23e45e33e69268a2d86fc207fe4b6c2b745f8..4a84a05cd582659b736850ec50844b70112128a1 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -5,16 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Config;
-use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\DataTable\Manager;
 use Piwik\Db;
-use Piwik\DbHelper;
-use Piwik\Option;
-use Piwik\Plugins\ScheduledReports\API;
-use Piwik\Site;
-use Piwik\Tracker\Cache;
-use Piwik\Piwik;
 
 /**
  * Tests extending DatabaseTestCase are much slower to run: the setUp will
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index e15cc1f1b36859d7a0c62905b1a8ced4790c647b..1a0b907aeba170bc5e7c6942157e6e910654a417 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -8,27 +8,27 @@
 use Piwik\Access;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\DataTable\Manager as DataTableManager;
 use Piwik\Date;
 use Piwik\Db;
+use Piwik\DbHelper;
+use Piwik\Log;
+use Piwik\Option;
+use Piwik\Piwik;
+use Piwik\Plugins\LanguagesManager\API as APILanguageManager;
 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\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Plugins\LanguagesManager\API as APILanguageManager;
 use Piwik\Plugins\UsersManager\UsersManager;
 use Piwik\ReportRenderer;
 use Piwik\Site;
-use Piwik\Url;
-use Piwik\Log;
-use Piwik\DbHelper;
-use Piwik\Piwik;
 use Piwik\Tracker\Cache;
 use Piwik\Translate;
-use Piwik\Option;
-use Piwik\DataTable\Manager as DataTableManager;
-use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Url;
 
 /**
  * Base type for all integration test fixtures. Integration test fixtures
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index ee04dedf66ec7e61fe71949412c09a20961a5132..7650cef641e2cd8214d0e2776a867ac5a85db08d 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -8,8 +8,8 @@
 use Piwik\Access;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
-use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 
 /**
  * Imports visits from several log files using the python log importer.
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index eb4ff269081f0ef91788759980f5835c81466f4a..070082f792cab59b54988ae371a5a9ac1a1ef66c 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -5,13 +5,10 @@
  * @link    http://piwik.org
  * @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\WidgetsList;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php';
 
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 4b0ca0c2497ccd1a73829af5437e5046f797d821..f84bb47f5f3735e5f27da861e6bfe8d327b1f0e2 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -8,8 +8,8 @@
 
 use Piwik\Date;
 use Piwik\Plugins\Goals\API;
-use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index fb841fe964fc4d7f176f4b189a24198ebab8b3d3..7512beaad0239b0a443241bf2147cbf4fdca32da 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -8,8 +8,7 @@
 namespace Piwik\Tests\Fixtures;
 
 use Piwik\Date;
-use Piwik\Tracker\Visit;
-use \ReflectionClass;
+use ReflectionClass;
 
 /**
  * This fixture is the combination of every other fixture defined by Piwik. Should be used
diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php
index 716d36fd99164dc9a3e40a2175aaa6c965f97f75..e918c10f314a71a388c00986e2a05c6dc656caf8 100644
--- a/tests/PHPUnit/Fixtures/SqlDump.php
+++ b/tests/PHPUnit/Fixtures/SqlDump.php
@@ -8,7 +8,6 @@
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Config;
 use Piwik\Db;
-use Piwik\DbHelper;
 use Piwik\Piwik;
 
 /**
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 23d1fa6663fbaae53cd953dd50f042056a46e311..5e27a081178d3c44348d0b48997ea3d1bdc40ec1 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -7,21 +7,19 @@
  */
 namespace Piwik\Tests\Fixtures;
 
+use Exception;
 use Piwik\Access;
-use Piwik\DbHelper;
-use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
-use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
-use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
-use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\AssetManager;
-use Piwik\Date;
 use Piwik\Common;
+use Piwik\Date;
 use Piwik\Db;
+use Piwik\DbHelper;
 use Piwik\FrontController;
 use Piwik\Option;
-use Piwik\Url;
+use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
+use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
+use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
 use Piwik\WidgetsList;
-use \Exception;
 
 /**
  * Fixture for UI tests.
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 4c324b90ca89d0d52e17ff659119e875af9780ba..9d11eb373c413f736ab18bb28872659e1466041e 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -6,7 +6,6 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\Access;
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
 
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php
index bc28100e742dffb98ec2e0e4b91028842d339bb7..c9fd69d8575a92b2fedf9c99dbea4c0d524000a7 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/Integration/ArchiveWebTest.php
@@ -6,10 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\Access;
-use Piwik\Date;
 use Piwik\Option;
-use Piwik\Plugins\SitesManager\API;
 
 /**
  * Tests to call the archive.php script via web and check there is no error,
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 09795bf0bbfc704867aade43c38d7abd1c53bc52..9793f38d7885bbc5ade48eecf1715cbd8584353b 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -6,15 +6,11 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\Date;
-use Piwik\Option;
-use Piwik\Piwik;
-use Piwik\Db;
 use Piwik\Common;
+use Piwik\Db;
+use Piwik\Plugins\CoreUpdater\CoreUpdater;
 use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
 use Piwik\Updater;
-use Piwik\Plugins\CoreUpdater\CoreUpdater;
-use \Fixture;
 
 /**
  * Tests that Piwik 2.0 works w/ data from Piwik 1.12.
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
index efaa567d242e53afd540a6ce874d8e7f19b5461e..7b6b1d7a919c60df078aa7588e724d00a38371fb 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
@@ -7,14 +7,13 @@
  */
 
 use Piwik\Access;
-use Piwik\ArchiveProcessor\Rules;
 use Piwik\ArchiveProcessor;
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Date;
-use Piwik\Db\BatchInsert;
 use Piwik\Db;
+use Piwik\Db\BatchInsert;
 use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Integration/Core/CliMultiTest.php b/tests/PHPUnit/Integration/Core/CliMultiTest.php
index 2ed13b4a8e80b6cdc03e87076ca7d57d2935ce31..a0dc3e817adf844377ccc4427c727891dafa1389 100644
--- a/tests/PHPUnit/Integration/Core/CliMultiTest.php
+++ b/tests/PHPUnit/Integration/Core/CliMultiTest.php
@@ -6,8 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use \Piwik\Version;
-use \Piwik\CliMulti;
+use Piwik\CliMulti;
+use Piwik\Version;
 
 /**
  * Class Core_CliMultiTest
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
index 63f35cc1af62cc34f5c32b388973c0fb45023a8c..f2aeb5202805aee08732f77bbaaa7e3f8fa3ecc3 100644
--- a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
+++ b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use \Piwik\CronArchive\SharedSiteIds;
+use Piwik\CronArchive\SharedSiteIds;
 
 /**
  * @group Core
diff --git a/tests/PHPUnit/Integration/Core/DbTest.php b/tests/PHPUnit/Integration/Core/DbTest.php
index 3a8c31e7e8ca5cda4d63accab32680aeff88a209..45b559a6c2c34de431069be756d13ad8828d1e6a 100644
--- a/tests/PHPUnit/Integration/Core/DbTest.php
+++ b/tests/PHPUnit/Integration/Core/DbTest.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\Db;
 use Piwik\Common;
+use Piwik\Db;
 
 /**
  * Class Core_DbTest
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
index 4e2fd72ecc0624d0fa3c17787746c2e96b6d7c45..a7c76aa078efb630401c692a084411a284724239 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -10,11 +10,11 @@ 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;
 
+require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
+
 /**
  * Class Core_LogTest
  *
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index 28e303f0f37d3afe3cdf73a2d25e1ad178683a22..2c15cd6f58d8f0eb0e2724a2fe67b116c632a6ba 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -11,7 +11,6 @@ use Piwik\MetricsFormatter;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Translate;
-use Piwik\Config;
 
 /**
  * Class Core_PiwikTest
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
index dbf6c34ce140897b2dfddbb1fab7ad213508f287..d9d3a674996ff4cca4bb6f49a2aced5de167028a 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
@@ -9,6 +9,7 @@
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
 use Piwik\Date;
+
 /**
  * Tests w/ 14 visitors w/ 2 visits each.
  * Uses geoip location provider to test city/region reports.
diff --git a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
index 4b2dcec99aded00a3644b72fd2a1fa4f1d0bdd10..857714ec7b492dcc52d2c2bee26e0f5a16f10893 100644
--- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
+++ b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
-use Piwik\Option;
 use Piwik\Config;
+use Piwik\Option;
+use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
 
 /**
  * Class Plugins_CorePluginsAdmin_UpdateCommunicationTest
diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
index 109f80c0226fe0a00954348dbbab1a4997a158e8..9b8008de98cb9562fa23f7ef885e47de2caef797 100644
--- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
+++ b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\Plugins\CoreUpdater\UpdateCommunication;
 use Piwik\Config;
 use Piwik\Option;
+use Piwik\Plugins\CoreUpdater\UpdateCommunication;
 use Piwik\UpdateCheck;
 use Piwik\Version;
 
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index 4feeb33b6d445d8e8cba88c91b00bda7377d4abb..24dc8e2c58efeecbcc22c462bb600b8a7d6a405b 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php
@@ -7,7 +7,6 @@
  */
 use Piwik\Access;
 use Piwik\AuthResult;
-use Piwik\Config;
 use Piwik\DbHelper;
 use Piwik\Plugins\Login\Auth;
 use Piwik\Plugins\UsersManager\API;
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
index 1efef82c2d43e68c95c3aaec7d851dc2c2400d22..a0d8af1635b77a0313c76a66b9047e2977f97c99 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
@@ -6,8 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
 use Piwik\Option;
+use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
 
 /**
  * Class Plugins_SitesManagerTest
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
index 9a182bd8f7fc0fbd1191c6b0098b77e173471b52..b2a0130ddb17cdd73eec2607645a56b7de406d0f 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-use \Piwik\Plugins\PrivacyManager\PrivacyManager;
+use Piwik\Plugins\PrivacyManager\PrivacyManager;
 
 /**
  * Class Plugins_SitesManagerTest
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 44da874c3752e3dada9ce269ce677a4cba71f609..225a2ae4c407a505e785a6d91f7c7d5928a64890 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -12,9 +12,8 @@ use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\ScheduledTask;
-use Piwik\ScheduledTime\Daily;
-use Piwik\ScheduledTime;
 use Piwik\ScheduledTime\Monthly;
+use Piwik\ScheduledTime;
 use Piwik\Site;
 
 require_once 'ScheduledReports/ScheduledReports.php';
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
index 51d081de6622c154d58f7ce5bea5e6e30fbfd01d..b540d2b845851c7c3d8cdee7b615dab489497008 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
@@ -9,8 +9,8 @@ use Piwik\Access;
 use Piwik\Date;
 use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\SegmentEditor\Model;
+use Piwik\Plugins\SitesManager\API as APISitesManager;
 
 /**
  * Class Plugins_SegmentEditorTest
diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/Integration/PurgeDataTest.php
index e2f5734792992440fbdc7b455a59cfac9df42cd8..a2621f0b1e9091794e1a9f137cf1e6224e6d53a2 100755
--- a/tests/PHPUnit/Integration/PurgeDataTest.php
+++ b/tests/PHPUnit/Integration/PurgeDataTest.php
@@ -8,9 +8,9 @@
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
-use \Piwik\Plugins\PrivacyManager\ReportsPurger;
-use \Piwik\Plugins\PrivacyManager\PrivacyManager;
-use \Piwik\API\Request;
+use Piwik\API\Request;
+use Piwik\Plugins\PrivacyManager\PrivacyManager;
+use Piwik\Plugins\PrivacyManager\ReportsPurger;
 
 /**
  * @group Integration
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index f9df2d3a431bc75eef59e983ef1668592b7fbd1b..7fe51d79ae99f235f1e051adb935e6c59dc7eec2 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -5,7 +5,6 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-use Piwik\Access;
 use Piwik\API\DocumentationGenerator;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
@@ -13,15 +12,9 @@ use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\DataTable\Manager;
 use Piwik\Db;
 use Piwik\DbHelper;
-use Piwik\Option;
-use Piwik\Piwik;
-use Piwik\Plugins\LanguagesManager\API;
 use Piwik\ReportRenderer;
-use Piwik\Site;
-use Piwik\Tracker\Cache;
 use Piwik\Translate;
 use Piwik\UrlHelper;
 
diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
index 4c4923cd3b5f76a494493ff8d81bb10a978ff93b..c8b73468b64fea776532142afe178f0dbfea23b1 100755
--- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php
+++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
@@ -7,7 +7,6 @@
  */
 use Piwik\Common;
 use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByBaseTranslations;
 use Piwik\Translate\Filter\ByParameterCount;
 use Piwik\Translate\Filter\EmptyTranslations;
 use Piwik\Translate\Filter\EncodedEntities;
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index 983b15d9cec0c673b098d17a5d410d048455f0bc..ca5b0e640e608e34a1cfba7a64793f16898e5b50 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -7,9 +7,9 @@
  */
 
 use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry;
 use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 68456920729443f023ca38b698d6fbb5f51e6f1f..df7538c63ac64e359829f11c0ee9ddcd07304cc5 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -1,9 +1,8 @@
 <?php
 
-use Piwik\Piwik;
-use Piwik\Config;
 use Piwik\Common;
-use Piwik\Session\SessionNamespace;
+use Piwik\Config;
+use Piwik\Piwik;
 
 require_once PIWIK_INCLUDE_PATH . "/core/Config.php";
 
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 6620cbb51d5867d3fd2d8a409c0b51f7fe233597..579b7c4c928800115d35e6474e0c43c29a8e1c97 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 6620cbb51d5867d3fd2d8a409c0b51f7fe233597
+Subproject commit 579b7c4c928800115d35e6474e0c43c29a8e1c97
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 6a3eec9a9388113020579811442bc991e39962d3..4f01b198dab82694d2b709e987f2737db4bf6d43 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -7,13 +7,12 @@
  *
  */
 
-use Piwik\Config;
 use Piwik\DataTable\Manager;
 use Piwik\Option;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Site;
-use Piwik\Tracker;
 use Piwik\Tracker\Cache;
+use Piwik\Tracker;
 
 require realpath(dirname(__FILE__)) . "/includes.php";