[Codingstyle] Disallow unused use statements (#18520)

* Forbid unused use statements

* Fix some incorrect classnames

* fix tests

* remove unused use statements

98 files changed, 7 insertions, 179 deletions

diff --git a/tests/PHPUnit/Fixtures/DisablePluginArchive.php b/tests/PHPUnit/Fixtures/DisablePluginArchive.php
index 4c96561b62..48791f0fce 100644
--- a/tests/PHPUnit/Fixtures/DisablePluginArchive.php
+++ b/tests/PHPUnit/Fixtures/DisablePluginArchive.php
@@ -7,12 +7,10 @@
  */
 namespace Piwik\Tests\Fixtures;
 
-use MatomoTracker;
 use Piwik\Date;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Tests\Framework\Fixture;
-use Exception;
 use Piwik\Tracker\Cache;
 
 /**
diff --git a/tests/PHPUnit/Fixtures/JSTrackingUIFixture.php b/tests/PHPUnit/Fixtures/JSTrackingUIFixture.php
index 77b4f74758..46dc8c32ef 100644
--- a/tests/PHPUnit/Fixtures/JSTrackingUIFixture.php
+++ b/tests/PHPUnit/Fixtures/JSTrackingUIFixture.php
@@ -10,7 +10,6 @@
 namespace Piwik\Tests\Fixtures;
 
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
 use Piwik\Plugins\GeoIp2\LocationProvider\GeoIp2\Php;
 use Piwik\Plugins\PrivacyManager\IPAnonymizer;
 use Piwik\Plugins\UserCountry\LocationProvider;
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index 78d691438e..34f2cc0917 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -7,7 +7,6 @@
  */
 namespace Piwik\Tests\Fixtures;
 
-use Piwik\Cache;
 use Piwik\Date;
 use Piwik\Plugins\Annotations\API as APIAnnotations;
 use Piwik\Plugins\Goals\API as APIGoals;
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index d5c00ffc27..ab2715ba54 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -8,7 +8,6 @@
 namespace Piwik\Tests\Fixtures;
 
 use Piwik\Cache;
-use Piwik\Common;
 use Piwik\Date;
 use Piwik\Option;
 use Piwik\Plugins\Goals\API;
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index ab9aa32a0c..c6e36aa67b 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -8,9 +8,7 @@
 namespace Piwik\Tests\Fixtures;
 
 use Piwik\API\Request;
-use Piwik\Common;
 use Piwik\Date;
-use Piwik\Db;
 use Piwik\Option;
 use Piwik\Plugins\UsersManager\Model;
 use ReflectionClass;
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index 4c09c290b1..e00a9b452a 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -9,7 +9,6 @@ namespace Piwik\Tests\Fixtures;
 
 use Piwik\Date;
 use Piwik\Tests\Framework\Fixture;
-use MatomoTracker;
 
 /**
  * Adds one site and tracks a couple visits with many pageviews. The
diff --git a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php
index f72a2061f8..37c94284b1 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php
@@ -7,11 +7,9 @@
  */
 namespace Piwik\Tests\Fixtures;
 
-use Piwik\Access;
 use Piwik\Date;
 use Piwik\Plugins\Annotations\API;
 use Piwik\Tests\Framework\Fixture;
-use Piwik\Tests\Framework\Mock\FakeAccess;
 
 /**
  * A fixture that adds two websites and annotations for each website.
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 724953f8c0..dcb6bd2c64 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -21,11 +21,9 @@ use Piwik\DbHelper;
 use Piwik\Filesystem;
 use Piwik\FrontController;
 use Piwik\Option;
-use Piwik\Piwik;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugin\ProcessedMetric;
 use Piwik\Plugin\Report;
-use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\API\API;
 use Piwik\Plugins\GeoIp2\LocationProvider\GeoIp2;
 use Piwik\Plugins\Monolog\Handler\WebNotificationHandler;
@@ -36,11 +34,9 @@ use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
 use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
-use Piwik\Plugins\UsersManager\Model;
 use Piwik\Plugins\UsersManager\UserUpdater;
 use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
 use Piwik\ReportRenderer;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Framework\XssTesting;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Psr\Container\ContainerInterface;
diff --git a/tests/PHPUnit/Fixtures/VisitsInCurrentYear.php b/tests/PHPUnit/Fixtures/VisitsInCurrentYear.php
index b77c361dbb..9c70c0adbe 100644
--- a/tests/PHPUnit/Fixtures/VisitsInCurrentYear.php
+++ b/tests/PHPUnit/Fixtures/VisitsInCurrentYear.php
@@ -7,13 +7,7 @@
  */
 namespace Piwik\Tests\Fixtures;
 
-use Piwik\Common;
-use Piwik\Date;
-use Piwik\Db;
-use Piwik\Plugins\Goals\API as APIGoals;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Tests\Framework\Fixture;
-use Piwik\Tracker\Cache;
 
 /**
  * This fixture adds one website and tracks two visits by one visitor.
diff --git a/tests/PHPUnit/Fixtures/VisitsTwoWebsitesWithAdditionalVisits.php b/tests/PHPUnit/Fixtures/VisitsTwoWebsitesWithAdditionalVisits.php
index ecf6d8a6d2..0bac3b7db8 100644
--- a/tests/PHPUnit/Fixtures/VisitsTwoWebsitesWithAdditionalVisits.php
+++ b/tests/PHPUnit/Fixtures/VisitsTwoWebsitesWithAdditionalVisits.php
@@ -7,7 +7,6 @@
  */
 namespace Piwik\Tests\Fixtures;
 
-use Piwik\Date;
 use Piwik\Tests\Framework\Fixture;
 
 /**
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 4c275477d5..86680ea6b4 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -40,7 +40,6 @@ 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\UsersManager\UsersManager;
 use Piwik\ReportRenderer;
 use Piwik\Session\SaveHandler\DbTable;
@@ -48,7 +47,6 @@ use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Singleton;
 use Piwik\Site;
-use Piwik\Tests;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\Mock\File as MockFileMethods;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
diff --git a/tests/PHPUnit/Framework/Mock/FakeAccess.php b/tests/PHPUnit/Framework/Mock/FakeAccess.php
index aa649fed1b..140b59bbd2 100644
--- a/tests/PHPUnit/Framework/Mock/FakeAccess.php
+++ b/tests/PHPUnit/Framework/Mock/FakeAccess.php
@@ -9,7 +9,6 @@ namespace Piwik\Tests\Framework\Mock;
 
 use Piwik\Access;
 use Piwik\Auth;
-use Piwik\Container\StaticContainer;
 use Piwik\NoAccessException;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php b/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php
index bb305deb05..60d2bcceba 100644
--- a/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php
+++ b/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Framework\Mock\Settings;
 
-use Piwik\Settings\Setting;
 
 class FakeMeasurableSettings extends \Piwik\Plugins\ExampleSettingsPlugin\MeasurableSettings {
     protected $pluginName = 'ExampleSettingsPlugin';
diff --git a/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php b/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php
index 2b00ad12f6..12954260ba 100644
--- a/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php
+++ b/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Framework\Mock\Settings;
 
-use Piwik\Settings\Setting;
 
 class FakeSystemSettings extends \Piwik\Plugins\ExampleSettingsPlugin\SystemSettings {
     protected $pluginName = 'ExampleSettingsPlugin';
diff --git a/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php b/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php
index 1a331ad6cb..318ff38bbd 100644
--- a/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php
+++ b/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Framework\Mock\Settings;
 
-use Piwik\Settings\Setting;
 
 class FakeUserSettings extends \Piwik\Plugins\ExampleSettingsPlugin\UserSettings {
     protected $pluginName = 'ExampleSettingsPlugin';
diff --git a/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php b/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php
index 0de5377265..073d3f7352 100644
--- a/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php
+++ b/tests/PHPUnit/Framework/Mock/Tracker/RequestSet.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Framework\Mock\Tracker;
 
 use Exception;
-use Piwik\Tracker;
 
 class RequestSet extends \Piwik\Tracker\RequestSet
 {
diff --git a/tests/PHPUnit/Framework/TestCase/ConsoleCommandTestCase.php b/tests/PHPUnit/Framework/TestCase/ConsoleCommandTestCase.php
index d0f60d1e09..71dc059b61 100644
--- a/tests/PHPUnit/Framework/TestCase/ConsoleCommandTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/ConsoleCommandTestCase.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Framework\TestCase;
 
 use Piwik\Console;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\ApplicationTester;
diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index 0dcbf83e03..88cc297690 100644
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -24,8 +24,6 @@ use Piwik\Piwik;
 use Piwik\Plugin\ProcessedMetric;
 use Piwik\ReportRenderer;
 use Piwik\Site;
-use Piwik\Tests\Framework\Constraint\ResponseCode;
-use Piwik\Tests\Framework\Constraint\HttpResponseText;
 use Piwik\Tests\Framework\Mock\File as MockFileMethods;
 use Piwik\Tests\Framework\TestRequest\ApiTestConfig;
 use Piwik\Tests\Framework\TestRequest\Collection;
diff --git a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
index db29202b10..1bbe090a6c 100644
--- a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Framework\TestCase;
 
 use Piwik\Application\Environment;
-use Piwik\Container\StaticContainer;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\File;
 
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php
index 1a7310f78b..aa5cf2410d 100644
--- a/tests/PHPUnit/Framework/TestRequest/Collection.php
+++ b/tests/PHPUnit/Framework/TestRequest/Collection.php
@@ -11,7 +11,6 @@ namespace Piwik\Tests\Framework\TestRequest;
 use Piwik\API\DocumentationGenerator;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
-use Piwik\Date;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Url;
 use Piwik\UrlHelper;
diff --git a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
index a7c36567cb..ceb721bcc0 100644
--- a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
+++ b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Framework;
 
 use Psr\Container\ContainerInterface;
-use Piwik\Application\Environment;
 use Piwik\Application\EnvironmentManipulator;
 use Piwik\Application\Kernel\GlobalSettingsProvider;
 use Piwik\Application\Kernel\PluginList;
diff --git a/tests/PHPUnit/Integration/AccessTest.php b/tests/PHPUnit/Integration/AccessTest.php
index 232581ffb6..886ddb5f9b 100644
--- a/tests/PHPUnit/Integration/AccessTest.php
+++ b/tests/PHPUnit/Integration/AccessTest.php
@@ -11,8 +11,6 @@ namespace Piwik\Tests\Integration;
 use Exception;
 use Piwik\Access;
 use Piwik\AuthResult;
-use Matomo\Cache\Cache;
-use Piwik\Db;
 use Piwik\NoAccessException;
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
diff --git a/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php b/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php
index 6f735e64f4..d640d805bf 100644
--- a/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php
+++ b/tests/PHPUnit/Integration/Archive/DataTableFactoryTest.php
@@ -8,11 +8,8 @@
 
 namespace Piwik\Tests\Integration\Archive;
 
-use Piwik\Archive;
-use Piwik\ArchiveProcessor;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Db;
 use Piwik\Period;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Segment;
diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
index b5fad41104..3058797448 100644
--- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
@@ -9,8 +9,6 @@
 namespace Piwik\Tests\Integration;
 
 use Exception;
-use Piwik\Access;
-use Piwik\Archive;
 use Piwik\ArchiveProcessor;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
@@ -21,10 +19,8 @@ use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Db\BatchInsert;
-use Piwik\DbHelper;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Plugins\SitesManager\API;
 use Piwik\Segment;
 use Piwik\SettingsServer;
 use Piwik\Site;
diff --git a/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php b/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php
index eed521a1d1..a373b5c362 100644
--- a/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessor/LoaderLockTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Tests\Integration\ArchiveProcessor;
 
 use Piwik\ArchiveProcessor\LoaderLock;
 use Piwik\Common;
-use Piwik\Db;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 class LoaderLockTest extends IntegrationTestCase
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php
index 802c3194a1..d4a0178122 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/Integration/ArchiveWebTest.php
@@ -10,9 +10,7 @@ namespace Piwik\Tests\Integration;
 use Piwik\Option;
 use Piwik\Http;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
-use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 use Piwik\Tests\Framework\Fixture;
-use Exception;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/tests/PHPUnit/Integration/Columns/UpdaterTest.php b/tests/PHPUnit/Integration/Columns/UpdaterTest.php
index 2b7e982cfd..a23e34c752 100644
--- a/tests/PHPUnit/Integration/Columns/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/Columns/UpdaterTest.php
@@ -15,7 +15,6 @@ use Piwik\Plugin\Dimension\ActionDimension;
 use Piwik\Plugin\Dimension\ConversionDimension;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
-use Piwik\Updater;
 use Piwik\Updater\Migration;
 
 // NOTE: we can't use PHPUnit mock framework since we have to set columnName/columnType. reflection will set it, but
diff --git a/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php b/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php
index cd5ac86bdf..52261c4db1 100644
--- a/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php
+++ b/tests/PHPUnit/Integration/Concurrency/LockBackend/MysqlLockBackendTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 class MysqlLockBackendTest extends IntegrationTestCase
 {
     /**
-     * @var MySQLLockBackend
+     * @var MySqlLockBackend
      */
     private $backend;
     private $key = 'testKeyValueKey';
@@ -43,7 +43,7 @@ class MysqlLockBackendTest extends IntegrationTestCase
 
     protected function createMysqlBackend()
     {
-        return new MySQLLockBackend();
+        return new MySqlLockBackend();
     }
 
     public function test_deleteIfKeyHasValue_ShouldNotWork_IfKeyDoesNotExist()
diff --git a/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php b/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php
index ac88ba9b8e..e1ab674d81 100644
--- a/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php
+++ b/tests/PHPUnit/Integration/CronArchive/QueueConsumerTest.php
@@ -27,7 +27,6 @@ use Piwik\Date;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
-use Piwik\Plugins\SitesManager\SitesManager;
 use Piwik\Segment;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
diff --git a/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php b/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php
index d178f9661c..efd5c12797 100644
--- a/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php
+++ b/tests/PHPUnit/Integration/CronArchive/SegmentArchivingTest.php
@@ -9,11 +9,8 @@
 namespace Piwik\Tests\Integration\CronArchive;
 
 use Piwik\Config;
-use Piwik\CronArchive;
 use Piwik\Date;
 use Piwik\CronArchive\SegmentArchiving;
-use Piwik\Option;
-use Piwik\Site;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php b/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php
index 2752244c04..ffd62b4ef0 100644
--- a/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php
+++ b/tests/PHPUnit/Integration/CronArchiveInvalidSegmentTest.php
@@ -16,7 +16,6 @@ use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeLogger;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Plugins\SegmentEditor\API as SegmentAPI;
-use Piwik\Version;
 
 /**
  * @group Archiver
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php
index c149ef918d..cf32511fd9 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php
@@ -10,9 +10,7 @@
 namespace Piwik\Tests\Integration\DataAccess;
 
 
-use Piwik\ArchiveProcessor\Parameters;
 use Piwik\ArchiveProcessor\Rules;
-use Piwik\Config;
 use Piwik\DataAccess\ArchiveSelector;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Date;
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php
index 1e4d77c80d..79ca3e286c 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\DataAccess;
 
 use Piwik\Access;
 use Piwik\ArchiveProcessor\Parameters;
-use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\DataAccess\ArchiveWriter;
@@ -18,7 +17,6 @@ use Piwik\Date;
 use Piwik\Db;
 use Piwik\Period\Day;
 use Piwik\Period\Factory as PeriodFactory;
-use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Segment;
 use Piwik\Sequence;
 use Piwik\Site;
diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
index a8311bdd09..5a53b5f92e 100644
--- a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
@@ -13,7 +13,6 @@ use Piwik\Config;
 use Piwik\Common;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\Date;
-use Piwik\Db;
 use Piwik\Period;
 use Piwik\Segment;
 use Piwik\Site;
diff --git a/tests/PHPUnit/Integration/EmailValidatorTest.php b/tests/PHPUnit/Integration/EmailValidatorTest.php
index bb34778aff..3ee1b3aa92 100644
--- a/tests/PHPUnit/Integration/EmailValidatorTest.php
+++ b/tests/PHPUnit/Integration/EmailValidatorTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration;
 
-use Piwik\Http;
 use Piwik\Piwik;
 
 /**
diff --git a/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php b/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php
index 45da6a6aff..1907a6c81f 100644
--- a/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php
+++ b/tests/PHPUnit/Integration/Measurable/MeasurableSettingTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Measurable;
 
 use Piwik\Settings\FieldConfig;
 use Piwik\Settings\Measurable\MeasurableSetting;
-use Piwik\Settings\Storage\Storage;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
diff --git a/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php b/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php
index 5ee12b23cd..1110ebba04 100644
--- a/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php
+++ b/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php
@@ -8,8 +8,6 @@
 
 namespace Piwik\Tests\Integration\Measurable;
 
-use Piwik\Access;
-use Piwik\Db;
 use Piwik\Plugin;
 use Piwik\Plugins\WebsiteMeasurable\Type as WebsiteType;
 use Piwik\Plugins\WebsiteMeasurable\MeasurableSettings;
diff --git a/tests/PHPUnit/Integration/Plugin/CategoriesTest.php b/tests/PHPUnit/Integration/Plugin/CategoriesTest.php
index b550fcd2f5..f12ded6f57 100644
--- a/tests/PHPUnit/Integration/Plugin/CategoriesTest.php
+++ b/tests/PHPUnit/Integration/Plugin/CategoriesTest.php
@@ -12,7 +12,6 @@ use Piwik\Category\Category;
 use Piwik\Category\Subcategory;
 use Piwik\Container\StaticContainer;
 use Piwik\Plugin\Categories;
-use Piwik\Settings\Storage;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/Plugin/ManagerTest.php b/tests/PHPUnit/Integration/Plugin/ManagerTest.php
index 8dadd20646..d2bbcef0b1 100644
--- a/tests/PHPUnit/Integration/Plugin/ManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugin/ManagerTest.php
@@ -10,13 +10,10 @@ namespace Piwik\Tests\Integration\Plugin;
 
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
-use Piwik\Db;
 use Piwik\Http\ControllerResolver;
 use Piwik\Plugin;
-use Piwik\Settings\Storage;
 use Piwik\Cache as PiwikCache;
 use Piwik\Tests\Integration\Settings\IntegrationTestCase;
-use Piwik\Widget\WidgetsList;
 
 /**
  * @group Plugin
diff --git a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php
index afdecc243d..af123afef0 100644
--- a/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php
+++ b/tests/PHPUnit/Integration/Plugin/ReleaseChannelsTest.php
@@ -8,12 +8,8 @@
 
 namespace Piwik\Tests\Integration\Plugin;
 
-use Piwik\Config;
 use Piwik\Container\StaticContainer;
-use Piwik\Db;
 use Piwik\Plugin;
-use Piwik\Settings\Storage;
-use Piwik\Cache as PiwikCache;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\UpdateCheck\ReleaseChannel;
diff --git a/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php b/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php
index 2915033e38..7ee397823a 100644
--- a/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php
+++ b/tests/PHPUnit/Integration/Plugin/SettingsProviderTest.php
@@ -9,13 +9,11 @@
 namespace Piwik\Tests\Integration\Plugin;
 
 use Piwik\Container\StaticContainer;
-use Piwik\Db;
 use Piwik\Plugin;
 use Piwik\Plugin\SettingsProvider;
 use Piwik\Settings\Measurable\MeasurableSettings;
 use Piwik\Settings\Plugin\SystemSettings;
 use Piwik\Settings\Plugin\UserSettings;
-use Piwik\Settings\Storage;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php b/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php
index 46993ab135..88c16ae34b 100644
--- a/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php
+++ b/tests/PHPUnit/Integration/Plugin/WidgetsProviderTest.php
@@ -9,9 +9,7 @@
 namespace Piwik\Tests\Integration\Plugin;
 
 use Piwik\Container\StaticContainer;
-use Piwik\Db;
 use Piwik\Plugin\WidgetsProvider;
-use Piwik\Settings\Storage;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Widget\WidgetConfig;
diff --git a/tests/PHPUnit/Integration/PluginTest.php b/tests/PHPUnit/Integration/PluginTest.php
index 7ab46a8945..430cde0719 100644
--- a/tests/PHPUnit/Integration/PluginTest.php
+++ b/tests/PHPUnit/Integration/PluginTest.php
@@ -9,11 +9,9 @@
 
 namespace PHPUnit\Integration;
 
-use Piwik\Common;
 use Piwik\CronArchive;
 use Piwik\CronArchive\ReArchiveList;
 use Piwik\Date;
-use Piwik\Db;
 use Piwik\Option;
 use Piwik\Plugin;
 use Piwik\Tests\Framework\Fixture;
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 8b875b922d..4f71c8f943 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -15,8 +15,6 @@ use Piwik\AssetManager\UIAssetFetcher;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Filesystem;
-use Piwik\Http;
-use Piwik\Plugin;
 use Piwik\Plugin\Manager;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tracker;
diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index 9e9662aefe..eab2877df8 100644
--- a/tests/PHPUnit/Integration/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
@@ -15,7 +15,6 @@ use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Db;
-use Piwik\Http;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Segment;
 use Piwik\Tests\Framework\Fixture;
diff --git a/tests/PHPUnit/Integration/SequenceTest.php b/tests/PHPUnit/Integration/SequenceTest.php
index d7e84ffaab..2db27a093e 100644
--- a/tests/PHPUnit/Integration/SequenceTest.php
+++ b/tests/PHPUnit/Integration/SequenceTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration;
 
-use Piwik\Db;
 use Piwik\Sequence;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/SessionTest.php b/tests/PHPUnit/Integration/SessionTest.php
index ae4ff2ecfd..60f0e4c0f6 100644
--- a/tests/PHPUnit/Integration/SessionTest.php
+++ b/tests/PHPUnit/Integration/SessionTest.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Integration;
 
 use Piwik\Http;
-use Piwik\Piwik;
 use Piwik\Session;
 use Piwik\Tests\Framework\Fixture;
 
diff --git a/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php b/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php
index ad4272deb1..ce0e15ca0d 100644
--- a/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php
+++ b/tests/PHPUnit/Integration/Settings/IntegrationTestCase.php
@@ -11,7 +11,6 @@ namespace Piwik\Tests\Integration\Settings;
 use PHPUnit\Framework\Constraint\IsType;
 use Piwik\Db;
 use Piwik\Settings\Setting;
-use Piwik\Settings\Storage;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\Mock\Settings\FakeSystemSettings;
 
diff --git a/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php b/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php
index b057162632..beae8b033b 100644
--- a/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php
+++ b/tests/PHPUnit/Integration/Settings/Measurable/MeasurablePropertyTest.php
@@ -8,11 +8,9 @@
 
 namespace Piwik\Tests\Integration\Settings\Plugin;
 
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\Settings\FieldConfig;
 use Piwik\Settings\Measurable\MeasurableProperty;
-use Piwik\Settings\Measurable\MeasurableSetting;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\Settings\FakeMeasurableSettings;
 use Piwik\Tests\Integration\Settings\IntegrationTestCase;
diff --git a/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php b/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php
index 7bc95322a2..c7bdbcc6b4 100644
--- a/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php
+++ b/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Plugin;
 
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\Settings\FieldConfig;
 use Piwik\Settings\Measurable\MeasurableSetting;
diff --git a/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php b/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php
index 40769e641a..209e927059 100644
--- a/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php
+++ b/tests/PHPUnit/Integration/Settings/Plugin/SystemConfigSettingTest.php
@@ -9,10 +9,8 @@
 namespace Piwik\Tests\Integration\Settings\Plugin;
 
 use Piwik\Config;
-use Piwik\Db;
 use Piwik\Settings\FieldConfig;
 use Piwik\Settings\Plugin\SystemConfigSetting;
-use Piwik\Settings\Plugin\SystemSetting;
 use Piwik\Tests\Integration\Settings\IntegrationTestCase;
 
 /**
diff --git a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php
index d3580d9e73..6abc8ffc92 100644
--- a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php
+++ b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingTest.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Integration\Settings\Plugin;
 
 use Piwik\Config;
-use Piwik\Db;
 use Piwik\Settings\FieldConfig;
 use Piwik\Settings\Plugin\SystemSetting;
 use Piwik\Tests\Integration\Settings\IntegrationTestCase;
diff --git a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php
index c7e89c9b6c..80a88c4eec 100644
--- a/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php
+++ b/tests/PHPUnit/Integration/Settings/Plugin/SystemSettingsTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Plugin;
 
-use Piwik\Db;
 use Piwik\Settings\Plugin\SystemSetting;
 use Piwik\Settings\Plugin\SystemSettings;
 use Piwik\Tests\Integration\Settings\BaseSettingsTestCase;
diff --git a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php
index 6732d12eea..120ade8833 100644
--- a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php
+++ b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingTest.php
@@ -11,9 +11,7 @@ namespace Piwik\Tests\Integration\Settings\Plugin;
 use Piwik\Db;
 use Piwik\Settings\FieldConfig;
 use Piwik\Settings\Plugin\UserSetting;
-use Piwik\Settings\Storage\Storage;
 use Piwik\Tests\Framework\Mock\FakeAccess;
-use Piwik\Tests\Framework\Mock\Settings\FakeBackend;
 use Piwik\Tests\Framework\Mock\Settings\FakeUserSettings;
 use Piwik\Tests\Integration\Settings\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php
index 00d5e455b0..fcb3eec238 100644
--- a/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php
+++ b/tests/PHPUnit/Integration/Settings/Plugin/UserSettingsTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Plugin;
 
-use Piwik\Db;
 use Piwik\Settings\Plugin\UserSetting;
 use Piwik\Settings\Plugin\UserSettings;
 use Piwik\Tests\Framework\Mock\Settings\FakeUserSettings;
diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php
index 1d557684f5..add4765bbc 100644
--- a/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php
+++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/ConfigTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Storage\Backend;
 
-use Piwik\Db;
 use Piwik\Settings\Storage\Backend\MeasurableSettingsTable;
 use Piwik\Settings\Storage\Backend\Config;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php
index e0b5edcef3..27c33d4de8 100644
--- a/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php
+++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/MeasurableSettingsTableTest.php
@@ -8,8 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Storage\Backend;
 
-use Piwik\Config;
-use Piwik\Db;
 use Piwik\Settings\Storage\Backend\MeasurableSettingsTable;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php
index 00617f3771..5048f75c47 100644
--- a/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php
+++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/PluginSettingsTableTest.php
@@ -8,8 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Storage\Backend;
 
-use Piwik\Config;
-use Piwik\Db;
 use Piwik\Settings\Storage\Backend\PluginSettingsTable;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php b/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php
index 8c077a2869..ff462b812d 100644
--- a/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php
+++ b/tests/PHPUnit/Integration/Settings/Storage/Backend/SitesTableTest.php
@@ -8,8 +8,6 @@
 
 namespace Piwik\Tests\Integration\Settings\Storage\Backend;
 
-use Piwik\Config;
-use Piwik\Db;
 use Piwik\Settings\Storage\Backend\SitesTable;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
diff --git a/tests/PHPUnit/Integration/SupportedBrowserTest.php b/tests/PHPUnit/Integration/SupportedBrowserTest.php
index 631df4f111..a8ecc4aa23 100644
--- a/tests/PHPUnit/Integration/SupportedBrowserTest.php
+++ b/tests/PHPUnit/Integration/SupportedBrowserTest.php
@@ -7,12 +7,7 @@
  */
 namespace Piwik\Tests\Integration;
 
-use Piwik\Http;
-use Piwik\Site;
-use Piwik\Piwik;
 use Piwik\SupportedBrowser;
-use Piwik\Tests\Framework\Fixture;
-use Piwik\Plugins\SitesManager\API;
 use Piwik\Exception\NotSupportedBrowserException;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
diff --git a/tests/PHPUnit/Integration/Tracker/DbTest.php b/tests/PHPUnit/Integration/Tracker/DbTest.php
index 9260abd4a2..f4a63d7352 100644
--- a/tests/PHPUnit/Integration/Tracker/DbTest.php
+++ b/tests/PHPUnit/Integration/Tracker/DbTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Tracker;
 
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Db;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Timer;
diff --git a/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php b/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php
index 687595f6d2..1e63e3cc7e 100644
--- a/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php
+++ b/tests/PHPUnit/Integration/Tracker/FingerprintSaltTest.php
@@ -8,16 +8,8 @@
 
 namespace Piwik\Tests\Integration\Tracker;
 
-use Piwik\Config;
 use Piwik\Date;
-use Piwik\Plugins\SitesManager\API;
-use Piwik\Tests\Framework\Mock\FakeAccess;
-use Piwik\Tracker\Action;
 use Piwik\Tracker\FingerprintSalt;
-use Piwik\Tracker\PageUrl;
-use Piwik\Tracker\Request;
-use Piwik\Translate;
-use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
diff --git a/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php b/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php
index d3a5d98b94..0a3046f24e 100644
--- a/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php
+++ b/tests/PHPUnit/Integration/Tracker/Handler/FactoryTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Tracker\Handler;
 
-use Piwik\EventDispatcher;
 use Piwik\Piwik;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker;
diff --git a/tests/PHPUnit/Integration/Tracker/RequestSetTest.php b/tests/PHPUnit/Integration/Tracker/RequestSetTest.php
index b0448e45dc..d0f7010281 100644
--- a/tests/PHPUnit/Integration/Tracker/RequestSetTest.php
+++ b/tests/PHPUnit/Integration/Tracker/RequestSetTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Tracker;
 
-use Piwik\EventDispatcher;
 use Piwik\Piwik;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tracker\Request;
diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
index be93db0811..be50c3e5f2 100644
--- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
+++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Tracker;
 
 use Piwik\Config;
 use Piwik\Piwik;
-use Piwik\Plugins\SitesManager\SitesManager;
 use Piwik\Tests\Framework\Mock\Plugin\Manager;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker\TrackerCodeGenerator;
diff --git a/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php b/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php
index b9b8c1c15f..336854da3e 100644
--- a/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php
+++ b/tests/PHPUnit/Integration/Tracker/Visit/FactoryTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Integration\Tracker\Visit;
 
-use Piwik\EventDispatcher;
 use Piwik\Piwik;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker;
diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index 8ca50e386a..e9251249d7 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
@@ -8,10 +8,8 @@
 
 namespace Piwik\Tests\Integration\Tracker;
 
-use Piwik\Cache;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
-use Matomo\Network\IPUtils;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Tests\Framework\Fixture;
diff --git a/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php b/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php
index 20a45a1a4d..f456dcfcff 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Integration\Tracker;
 
 use Matomo\Network\IP;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Date;
 use Piwik\EventDispatcher;
 use Piwik\Tests\Framework\Fixture;
diff --git a/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php b/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php
index f817b1f1a0..9bd6b4fa7f 100644
--- a/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php
+++ b/tests/PHPUnit/Integration/Updater/Migration/Db/FactoryTest.php
@@ -9,10 +9,7 @@
 namespace Piwik\Tests\Integration\Updater\Migration\Db;
 
 use Piwik\Common;
-use Piwik\Config;
-use Piwik\Db;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
-use Piwik\Updater\Migration\Config\Set;
 use Piwik\Updater\Migration\Db\AddColumn;
 use Piwik\Updater\Migration\Db\AddColumns;
 use Piwik\Updater\Migration\Db\AddIndex;
diff --git a/tests/PHPUnit/System/ApiGetReportMetadataTest.php b/tests/PHPUnit/System/ApiGetReportMetadataTest.php
index 82743b9131..3c7f834e49 100644
--- a/tests/PHPUnit/System/ApiGetReportMetadataTest.php
+++ b/tests/PHPUnit/System/ApiGetReportMetadataTest.php
@@ -8,7 +8,6 @@
 namespace Piwik\Tests\System;
 
 use Piwik\API\Proxy;
-use Piwik\Cache;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\ThreeGoalsOnePageview;
 
diff --git a/tests/PHPUnit/System/ArchiveInvalidationTest.php b/tests/PHPUnit/System/ArchiveInvalidationTest.php
index 63c23b47a5..7e50a9cec5 100644
--- a/tests/PHPUnit/System/ArchiveInvalidationTest.php
+++ b/tests/PHPUnit/System/ArchiveInvalidationTest.php
@@ -9,10 +9,7 @@ namespace Piwik\Tests\System;
 
 use Piwik\API\Request;
 use Piwik\ArchiveProcessor\Rules;
-use Piwik\Common;
 use Piwik\Config;
-use Piwik\Date;
-use Piwik\Db;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Tests\Fixtures\VisitsTwoWebsitesWithAdditionalVisits;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index 8d8a055b5e..0cacc3e832 100644
--- a/tests/PHPUnit/System/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -7,13 +7,9 @@
  */
 namespace Piwik\Tests\System;
 
-use Piwik\Application\Kernel\GlobalSettingsProvider;
 use Piwik\Cache;
 use Piwik\Config;
-use Piwik\Date;
 use Piwik\Plugins\Actions\ArchivingHelper;
-use Piwik\Tests\Framework\Fixture;
-use Piwik\Tests\Framework\Mock\TestConfig;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider;
 
diff --git a/tests/PHPUnit/System/ConsoleTest.php b/tests/PHPUnit/System/ConsoleTest.php
index a82d31ecfb..3ae12f7b6d 100644
--- a/tests/PHPUnit/System/ConsoleTest.php
+++ b/tests/PHPUnit/System/ConsoleTest.php
@@ -9,9 +9,7 @@
 namespace Piwik\Tests\System;
 
 use Piwik\CliMulti\CliPhp;
-use Piwik\Config;
 use Piwik\Container\StaticContainer;
-use Piwik\Development;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\Monolog\Handler\FailureLogMessageDetector;
 use Piwik\Tests\Framework\Fixture;
@@ -166,17 +164,17 @@ class ConsoleTest extends ConsoleCommandTestCase
         $output = $this->normalizeOutput($output);
 
         $expected = <<<END
-PHP Fatal error:  Allowed memory size of X bytes exhausted (tried to allocate X bytes) in /tests/PHPUnit/System/ConsoleTest.php on line 85
+PHP Fatal error:  Allowed memory size of X bytes exhausted (tried to allocate X bytes) in /tests/PHPUnit/System/ConsoleTest.php on line 83
 
-Fatal error: Allowed memory size of X bytes exhausted (tried to allocate X bytes) in /tests/PHPUnit/System/ConsoleTest.php on line 85
+Fatal error: Allowed memory size of X bytes exhausted (tried to allocate X bytes) in /tests/PHPUnit/System/ConsoleTest.php on line 83
 *** IN SAFEMODE ***
 Matomo encountered an error: Allowed memory size of X bytes exhausted (tried to allocate X bytes) (which lead to: Error: array (
   'type' => 1,
   'message' => 'Allowed memory size of X bytes exhausted (tried to allocate X bytes)',
   'file' => '/tests/PHPUnit/System/ConsoleTest.php',
-  'line' => 85,
-  'backtrace' => ' on /tests/PHPUnit/System/ConsoleTest.php(85)
-#0 /tests/PHPUnit/System/ConsoleTest.php(72): Piwik\\\\Tests\\\\System\\\\TestCommandWithFatalError->executeImpl()
+  'line' => 83,
+  'backtrace' => ' on /tests/PHPUnit/System/ConsoleTest.php(83)
+#0 /tests/PHPUnit/System/ConsoleTest.php(70): Piwik\\\\Tests\\\\System\\\\TestCommandWithFatalError->executeImpl()
 #1 /vendor/symfony/console/Symfony/Component/Console/Command/Command.php(257): Piwik\\\\Tests\\\\System\\\\TestCommandWithFatalError->execute()
 ',
 ))
diff --git a/tests/PHPUnit/System/FlattenReportsTest.php b/tests/PHPUnit/System/FlattenReportsTest.php
index 0785639de1..ecef5caf1a 100644
--- a/tests/PHPUnit/System/FlattenReportsTest.php
+++ b/tests/PHPUnit/System/FlattenReportsTest.php
@@ -8,7 +8,6 @@
 namespace Piwik\Tests\System;
 
 use Piwik\EventDispatcher;
-use Piwik\Piwik;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\Referrers\Reports\GetWebsites;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
diff --git a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php
index cfa386718d..7afcdc86f4 100644
--- a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php
+++ b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php
@@ -7,7 +7,6 @@
  */
 namespace Piwik\Tests\System;
 
-use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot;
 
diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php
index 6a3af0d3fd..baf0fd2fb5 100644
--- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php
+++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php
@@ -13,7 +13,6 @@ use Piwik\Common;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Db;
-use Piwik\DbHelper;
 use Piwik\Piwik;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
diff --git a/tests/PHPUnit/System/TrackerTest.php b/tests/PHPUnit/System/TrackerTest.php
index 592b65c75c..e00d78aa7a 100644
--- a/tests/PHPUnit/System/TrackerTest.php
+++ b/tests/PHPUnit/System/TrackerTest.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\Option;
 use Piwik\Plugins\UserCountry\LocationProvider;
@@ -19,7 +18,6 @@ use Piwik\Scheduler\Timetable;
 use Piwik\SettingsPiwik;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
-use Piwik\Tracker;
 
 /**
  * @group Core
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 4708ba7013..0df58a06c5 100644
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -8,11 +8,6 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Archive;
-use Piwik\Archive\ArchivePurger;
-use Piwik\Cache;
-use Piwik\Container\StaticContainer;
-use Piwik\Date;
-use Piwik\Segment;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
 
diff --git a/tests/PHPUnit/System/Utf8mb4Test.php b/tests/PHPUnit/System/Utf8mb4Test.php
index 1fb18bae3d..09c7eba365 100644
--- a/tests/PHPUnit/System/Utf8mb4Test.php
+++ b/tests/PHPUnit/System/Utf8mb4Test.php
@@ -7,13 +7,8 @@
  */
 namespace Piwik\Tests\System;
 
-use Piwik\Common;
-use Piwik\Db;
 use Piwik\Tests\Fixtures\Utf8mb4;
-use Piwik\Tests\Framework\Fixture;
-use Piwik\Tracker\Action;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
-use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls;
 
 /**
  * Tests for tracking parameters containing 4 byte UTF8 chars.
diff --git a/tests/PHPUnit/Unit/AssetManagerTest.php b/tests/PHPUnit/Unit/AssetManagerTest.php
index ed34623130..406739bc8f 100644
--- a/tests/PHPUnit/Unit/AssetManagerTest.php
+++ b/tests/PHPUnit/Unit/AssetManagerTest.php
@@ -7,7 +7,6 @@
  */
 namespace Piwik\Tests\Unit;
 
-use Piwik\Cache;
 use Piwik\AssetManager;
 use Piwik\Config;
 
diff --git a/tests/PHPUnit/Unit/Category/CategoryTest.php b/tests/PHPUnit/Unit/Category/CategoryTest.php
index 8304375483..d9d550b494 100644
--- a/tests/PHPUnit/Unit/Category/CategoryTest.php
+++ b/tests/PHPUnit/Unit/Category/CategoryTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Unit\Category;
 
-use Piwik\Cache;
 use Piwik\Category\Category;
 use Piwik\Category\Subcategory;
 
diff --git a/tests/PHPUnit/Unit/Category/SubcategoryTest.php b/tests/PHPUnit/Unit/Category/SubcategoryTest.php
index 1cc42e0948..f04fb78ede 100644
--- a/tests/PHPUnit/Unit/Category/SubcategoryTest.php
+++ b/tests/PHPUnit/Unit/Category/SubcategoryTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Tests\Unit\Category;
 
-use Piwik\Cache;
 use Piwik\Category\Subcategory;
 
 /**
diff --git a/tests/PHPUnit/Unit/CliMulti/RequestParserTest.php b/tests/PHPUnit/Unit/CliMulti/RequestParserTest.php
index 883dfe922a..0219d546e5 100644
--- a/tests/PHPUnit/Unit/CliMulti/RequestParserTest.php
+++ b/tests/PHPUnit/Unit/CliMulti/RequestParserTest.php
@@ -10,7 +10,6 @@
 namespace PHPUnit\Unit\CliMulti;
 
 use PHPUnit\Framework\TestCase;
-use Piwik\API\Request;
 use Piwik\CliMulti\RequestParser;
 
 class RequestParserTest extends TestCase
diff --git a/tests/PHPUnit/Unit/Config/IniFileChainTest.php b/tests/PHPUnit/Unit/Config/IniFileChainTest.php
index 0274d12fba..886f214f48 100644
--- a/tests/PHPUnit/Unit/Config/IniFileChainTest.php
+++ b/tests/PHPUnit/Unit/Config/IniFileChainTest.php
@@ -8,7 +8,6 @@
 namespace Piwik\Tests\Unit\Config;
 
 use PHPUnit\Framework\TestCase;
-use Piwik\Config;
 use Piwik\Config\IniFileChain;
 
 /**
diff --git a/tests/PHPUnit/Unit/DataAccess/ArchiveWriterTest.php b/tests/PHPUnit/Unit/DataAccess/ArchiveWriterTest.php
index b358e23e90..600078aecd 100644
--- a/tests/PHPUnit/Unit/DataAccess/ArchiveWriterTest.php
+++ b/tests/PHPUnit/Unit/DataAccess/ArchiveWriterTest.php
@@ -10,8 +10,6 @@ namespace Piwik\Tests\Unit;
 
 use Piwik\Archive\Chunk;
 use Piwik\DataAccess\ArchiveWriter;
-use Piwik\DataTable;
-use Piwik\Segment;
 
 /**
  * @group ArchiveWriterTest
diff --git a/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php b/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php
index f315da52fd..4f80c779b8 100644
--- a/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php
+++ b/tests/PHPUnit/Unit/DataAccess/LogQueryBuilder/JoinGeneratorTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Tests\Unit\DataAccess;
 use Piwik\DataAccess\LogQueryBuilder\JoinGenerator;
 use Piwik\DataAccess\LogQueryBuilder\JoinTables;
 use Piwik\Tests\Framework\Mock\Plugin\LogTablesProvider;
-use Piwik\Tracker\Visit;
 
 /**
  * @group Core
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php
index e2bc31f960..e4d9ce5da8 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSegmentFilterBySegmentValueTest.php
@@ -10,10 +10,8 @@ namespace Piwik\Tests\Core\DataTable\Filter;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Plugins\Actions\Reports\GetOutlinks;
 use Piwik\Plugins\DevicePlugins\Reports\GetPlugin;
 use Piwik\Plugins\UserCountry\Reports\GetCity;
-use Piwik\Plugins\UserCountry\Reports\GetCountry;
 use Piwik\Plugins\VisitsSummary\Reports\Get;
 
 /**
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
index 93c7e927a1..29d99d7a38 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Tests\Unit\DataTable\Filter;
 use Piwik\DataTable\Filter\RangeCheck;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent;
 
 /**
  * @group DataTableTest
diff --git a/tests/PHPUnit/Unit/DataTable/ManagerTest.php b/tests/PHPUnit/Unit/DataTable/ManagerTest.php
index 7c482a585d..5a5a82f74d 100644
--- a/tests/PHPUnit/Unit/DataTable/ManagerTest.php
+++ b/tests/PHPUnit/Unit/DataTable/ManagerTest.php
@@ -2,10 +2,8 @@
 
 namespace Piwik\Tests\Unit\DataTable;
 
-use Piwik\Config;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable;
-use Piwik\DataTable\Row;
 
 /**
  * @group DataTable
diff --git a/tests/PHPUnit/Unit/DataTable/MapTest.php b/tests/PHPUnit/Unit/DataTable/MapTest.php
index e21147f240..03639f24f7 100644
--- a/tests/PHPUnit/Unit/DataTable/MapTest.php
+++ b/tests/PHPUnit/Unit/DataTable/MapTest.php
@@ -2,11 +2,9 @@
 
 namespace Piwik\Tests\Unit\DataTable;
 
-use Piwik\Config;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Tests\Framework\Mock\TestConfig;
 
 /**
  * @group DataTableTest
diff --git a/tests/PHPUnit/Unit/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php
index 57b5297910..e0fc18b7f4 100644
--- a/tests/PHPUnit/Unit/DataTableTest.php
+++ b/tests/PHPUnit/Unit/DataTableTest.php
@@ -14,7 +14,6 @@ use Piwik\DataTable\Row;
 use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Timer;
-use Symfony\Component\VarDumper\Cloner\Data;
 
 /**
  * @group DataTableTest
diff --git a/tests/PHPUnit/Unit/FilesystemTest.php b/tests/PHPUnit/Unit/FilesystemTest.php
index 4913ee0844..3c27985b83 100644
--- a/tests/PHPUnit/Unit/FilesystemTest.php
+++ b/tests/PHPUnit/Unit/FilesystemTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Unit;
 
 use Piwik\Filesystem;
 use Piwik\Tests\Framework\Mock\File;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
 
 /**
  * @group Core
diff --git a/tests/PHPUnit/Unit/Period/RangeTest.php b/tests/PHPUnit/Unit/Period/RangeTest.php
index e817f1bd7e..bbb0873b87 100644
--- a/tests/PHPUnit/Unit/Period/RangeTest.php
+++ b/tests/PHPUnit/Unit/Period/RangeTest.php
@@ -10,7 +10,6 @@ namespace Piwik\Tests\Unit\Period;
 
 use Exception;
 use Piwik\Date;
-use Piwik\Period;
 use Piwik\Period\Month;
 use Piwik\Period\Range;
 use Piwik\Period\Week;
diff --git a/tests/PHPUnit/Unit/PeriodTest.php b/tests/PHPUnit/Unit/PeriodTest.php
index 2b7f4c6275..dae057c732 100644
--- a/tests/PHPUnit/Unit/PeriodTest.php
+++ b/tests/PHPUnit/Unit/PeriodTest.php
@@ -14,7 +14,6 @@ use Piwik\Period;
 use Piwik\Period\Month;
 use Piwik\Period\Week;
 use Piwik\Period\Year;
-use Piwik\Translation\Translator;
 
 /**
  * @group Core
diff --git a/tests/PHPUnit/Unit/Report/ReportWidgetFactoryTest.php b/tests/PHPUnit/Unit/Report/ReportWidgetFactoryTest.php
index 6d4b41dfd6..a59d204dc3 100644
--- a/tests/PHPUnit/Unit/Report/ReportWidgetFactoryTest.php
+++ b/tests/PHPUnit/Unit/Report/ReportWidgetFactoryTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Tests\Unit\Report;
 use Piwik\Plugin\Report;
 use Piwik\Report\ReportWidgetConfig;
 use Piwik\Report\ReportWidgetFactory;
-use Piwik\Widget\WidgetConfig;
 use Piwik\Widget\WidgetContainerConfig;
 
 class GetBasicReport extends Report
diff --git a/tests/PHPUnit/Unit/Scheduler/TimetableTest.php b/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
index 2d930b0d06..62aeb71a63 100644
--- a/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
+++ b/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
@@ -9,7 +9,6 @@
 namespace Piwik\Tests\Unit\Scheduler;
 
 use Piwik\Date;
-use Piwik\Plugin;
 use Piwik\Scheduler\Task;
 use Piwik\Scheduler\Timetable;
 use Piwik\Tests\Framework\Mock\PiwikOption;
diff --git a/tests/PHPUnit/Unit/Translation/FilesTest.php b/tests/PHPUnit/Unit/Translation/FilesTest.php
index ad41a3fba4..e9687c3a9a 100644
--- a/tests/PHPUnit/Unit/Translation/FilesTest.php
+++ b/tests/PHPUnit/Unit/Translation/FilesTest.php
@@ -8,8 +8,6 @@
 
 namespace Piwik\Tests\Unit\Translation\Loader;
 
-use Piwik\Translation\Loader\JsonFileLoader;
-use Piwik\Translation\Translator;
 
 /**
  * @group Translation
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 961627e5ac..589606864f 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -1,8 +1,6 @@
 <?php
 
 use Piwik\Application\Environment;
-use Piwik\Container\StaticContainer;
-use Piwik\Http;
 use Piwik\Intl\Locale;
 use Piwik\Config;
 use Piwik\SettingsPiwik;