diff --git a/src/Error/Middleware/ErrorHandlerMiddleware.php b/src/Error/Middleware/ErrorHandlerMiddleware.php
index e5a81793ed0..36b6f67e1e7 100644
--- a/src/Error/Middleware/ErrorHandlerMiddleware.php
+++ b/src/Error/Middleware/ErrorHandlerMiddleware.php
@@ -18,7 +18,6 @@
 use Cake\Core\Configure;
 use Cake\Core\InstanceConfigTrait;
 use Cake\Error\ExceptionRenderer;
-use Cake\Error\ExceptionRendererInterface;
 use Cake\Log\Log;
 use Exception;
 
diff --git a/src/Http/Response.php b/src/Http/Response.php
index aaae8f5f5b2..4d5bda4cd18 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -16,7 +16,6 @@
 
 use Cake\Core\Configure;
 use Cake\Filesystem\File;
-use Cake\Http\CallbackStream;
 use Cake\Log\Log;
 use Cake\Network\CorsBuilder;
 use Cake\Network\Exception\NotFoundException;
diff --git a/src/Http/Server.php b/src/Http/Server.php
index 65ad1d8bf0d..9aa6d265265 100644
--- a/src/Http/Server.php
+++ b/src/Http/Server.php
@@ -15,11 +15,9 @@
 namespace Cake\Http;
 
 use Cake\Event\EventDispatcherTrait;
-use Cake\Http\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;
-use UnexpectedValueException;
 use Zend\Diactoros\Response\EmitterInterface;
 
 /**
diff --git a/src/Http/ServerRequestFactory.php b/src/Http/ServerRequestFactory.php
index b7c7d942006..cd3b49e0940 100644
--- a/src/Http/ServerRequestFactory.php
+++ b/src/Http/ServerRequestFactory.php
@@ -15,7 +15,6 @@
 namespace Cake\Http;
 
 use Cake\Core\Configure;
-use Cake\Http\ServerRequest;
 use Cake\Network\Session;
 use Cake\Utility\Hash;
 use Zend\Diactoros\ServerRequestFactory as BaseFactory;
diff --git a/src/I18n/I18n.php b/src/I18n/I18n.php
index 5c8e17bc9f7..dcc90120cc6 100644
--- a/src/I18n/I18n.php
+++ b/src/I18n/I18n.php
@@ -19,7 +19,6 @@
 use Cake\Cache\Cache;
 use Cake\I18n\Formatter\IcuFormatter;
 use Cake\I18n\Formatter\SprintfFormatter;
-use Cake\I18n\TranslatorFactory;
 use Locale;
 
 /**
diff --git a/src/I18n/TranslatorRegistry.php b/src/I18n/TranslatorRegistry.php
index 8b95608f213..2a1ddcc11dd 100644
--- a/src/I18n/TranslatorRegistry.php
+++ b/src/I18n/TranslatorRegistry.php
@@ -19,7 +19,6 @@
 use Aura\Intl\PackageLocator;
 use Aura\Intl\TranslatorLocator;
 use Cake\Cache\CacheEngine;
-use Cake\I18n\TranslatorFactory;
 
 /**
  * Constructs and stores instances of translators that can be
diff --git a/src/ORM/Association/Loader/SelectWithPivotLoader.php b/src/ORM/Association/Loader/SelectWithPivotLoader.php
index 0ab49225336..c208f8145a6 100644
--- a/src/ORM/Association/Loader/SelectWithPivotLoader.php
+++ b/src/ORM/Association/Loader/SelectWithPivotLoader.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\ORM\Association\Loader;
 
-use InvalidArgumentException;
 use RuntimeException;
 
 /**
diff --git a/src/ORM/Behavior/CounterCacheBehavior.php b/src/ORM/Behavior/CounterCacheBehavior.php
index 4f6dd132713..babd5e929b5 100644
--- a/src/ORM/Behavior/CounterCacheBehavior.php
+++ b/src/ORM/Behavior/CounterCacheBehavior.php
@@ -18,8 +18,6 @@
 use Cake\Event\Event;
 use Cake\ORM\Association;
 use Cake\ORM\Behavior;
-use Cake\Utility\Hash;
-use Cake\Utility\Inflector;
 
 /**
  * CounterCache behavior
diff --git a/tests/TestCase/Auth/WeakPasswordHasherTest.php b/tests/TestCase/Auth/WeakPasswordHasherTest.php
index 0fb2cf162f3..007f2011ff3 100644
--- a/tests/TestCase/Auth/WeakPasswordHasherTest.php
+++ b/tests/TestCase/Auth/WeakPasswordHasherTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Auth;
 
 use Cake\Auth\WeakPasswordHasher;
-use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Security;
 
diff --git a/tests/TestCase/BasicsTest.php b/tests/TestCase/BasicsTest.php
index 7e07be2748c..0bf7eae524c 100644
--- a/tests/TestCase/BasicsTest.php
+++ b/tests/TestCase/BasicsTest.php
@@ -16,7 +16,6 @@
  */
 namespace Cake\Test\TestCase;
 
-use Cake\Core\Configure;
 use Cake\Event\EventManager;
 use Cake\Http\Response;
 use Cake\TestSuite\TestCase;
diff --git a/tests/TestCase/Cache/Engine/ApcEngineTest.php b/tests/TestCase/Cache/Engine/ApcEngineTest.php
index 93f7946e1fa..4063198a2d3 100644
--- a/tests/TestCase/Cache/Engine/ApcEngineTest.php
+++ b/tests/TestCase/Cache/Engine/ApcEngineTest.php
@@ -16,7 +16,6 @@
 namespace Cake\Test\TestCase\Cache\Engine;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Cache/Engine/RedisEngineTest.php b/tests/TestCase/Cache/Engine/RedisEngineTest.php
index f87605bd116..c23381ee28f 100644
--- a/tests/TestCase/Cache/Engine/RedisEngineTest.php
+++ b/tests/TestCase/Cache/Engine/RedisEngineTest.php
@@ -18,7 +18,6 @@
 
 use Cake\Cache\Cache;
 use Cake\Cache\Engine\RedisEngine;
-use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Cache/Engine/WincacheEngineTest.php b/tests/TestCase/Cache/Engine/WincacheEngineTest.php
index 0c3b6319866..ff0ea9225d9 100644
--- a/tests/TestCase/Cache/Engine/WincacheEngineTest.php
+++ b/tests/TestCase/Cache/Engine/WincacheEngineTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Cache\Engine;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Cache/Engine/XcacheEngineTest.php b/tests/TestCase/Cache/Engine/XcacheEngineTest.php
index baa48f24f4c..e00e34c4842 100644
--- a/tests/TestCase/Cache/Engine/XcacheEngineTest.php
+++ b/tests/TestCase/Cache/Engine/XcacheEngineTest.php
@@ -17,7 +17,6 @@
 namespace Cake\Test\TestCase\Cache\Engine;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php b/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php
index c486c37ed26..4c3d917981b 100644
--- a/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php
+++ b/tests/TestCase/Database/ExpressionTypeCastingIntegrationTest.php
@@ -17,7 +17,6 @@
 use Cake\Database\Driver\Sqlserver;
 use Cake\Database\Expression\FunctionExpression;
 use Cake\Database\Type;
-use Cake\Database\Type\BinaryType;
 use Cake\Database\Type\ExpressionTypeInterface;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
index 168ab2ceac4..afd38fa2110 100644
--- a/tests/TestCase/Database/QueryTest.php
+++ b/tests/TestCase/Database/QueryTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Database;
 
-use Cake\Core\Configure;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Database\Query;
 use Cake\Database\StatementInterface;
diff --git a/tests/TestCase/Database/Schema/CollectionTest.php b/tests/TestCase/Database/Schema/CollectionTest.php
index fea4f6e1574..2657c128f82 100644
--- a/tests/TestCase/Database/Schema/CollectionTest.php
+++ b/tests/TestCase/Database/Schema/CollectionTest.php
@@ -15,7 +15,6 @@
 namespace Cake\Test\TestCase\Database\Schema;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
 use Cake\Database\Schema\Collection;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
diff --git a/tests/TestCase/Http/BaseApplicationTest.php b/tests/TestCase/Http/BaseApplicationTest.php
index 07ef3e3aba1..2b5f1be454e 100644
--- a/tests/TestCase/Http/BaseApplicationTest.php
+++ b/tests/TestCase/Http/BaseApplicationTest.php
@@ -2,7 +2,6 @@
 namespace Cake\Test\TestCase;
 
 use Cake\Core\Configure;
-use Cake\Http\BaseApplication;
 use Cake\Http\Response;
 use Cake\Http\ServerRequestFactory;
 use Cake\TestSuite\TestCase;
diff --git a/tests/TestCase/Http/ResponseEmitterTest.php b/tests/TestCase/Http/ResponseEmitterTest.php
index 5038f25db0e..5ebaee7782f 100644
--- a/tests/TestCase/Http/ResponseEmitterTest.php
+++ b/tests/TestCase/Http/ResponseEmitterTest.php
@@ -18,8 +18,6 @@
 use Cake\Http\Response;
 use Cake\Http\ResponseEmitter;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\Stream;
 
 require_once __DIR__ . '/server_mocks.php';
 
diff --git a/tests/TestCase/Http/ResponseTransformerTest.php b/tests/TestCase/Http/ResponseTransformerTest.php
index f892798991c..74727712209 100644
--- a/tests/TestCase/Http/ResponseTransformerTest.php
+++ b/tests/TestCase/Http/ResponseTransformerTest.php
@@ -16,7 +16,6 @@
 
 use Cake\Http\Response as CakeResponse;
 use Cake\Http\ResponseTransformer;
-use Cake\Network\Session;
 use Cake\TestSuite\TestCase;
 use Zend\Diactoros\Response as PsrResponse;
 use Zend\Diactoros\Stream;
diff --git a/tests/TestCase/Log/LogTraitTest.php b/tests/TestCase/Log/LogTraitTest.php
index d92053df8aa..c5e522f97dd 100644
--- a/tests/TestCase/Log/LogTraitTest.php
+++ b/tests/TestCase/Log/LogTraitTest.php
@@ -14,7 +14,6 @@
 namespace Cake\Test\TestCase\Log;
 
 use Cake\Log\Log;
-use Cake\Log\LogInterface;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/Network/Session/CacheSessionTest.php b/tests/TestCase/Network/Session/CacheSessionTest.php
index f4904c5d048..eff8eede471 100644
--- a/tests/TestCase/Network/Session/CacheSessionTest.php
+++ b/tests/TestCase/Network/Session/CacheSessionTest.php
@@ -17,8 +17,6 @@
 namespace Cake\Test\TestCase\Network\Session;
 
 use Cake\Cache\Cache;
-use Cake\Core\Configure;
-use Cake\Network\Session;
 use Cake\Network\Session\CacheSession;
 use Cake\TestSuite\TestCase;
 
diff --git a/tests/TestCase/ORM/SaveOptionsBuilderTest.php b/tests/TestCase/ORM/SaveOptionsBuilderTest.php
index 83b11b74cf4..39f212dd30a 100644
--- a/tests/TestCase/ORM/SaveOptionsBuilderTest.php
+++ b/tests/TestCase/ORM/SaveOptionsBuilderTest.php
@@ -15,10 +15,8 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Datasource\ConnectionManager;
-use Cake\ORM\Entity;
 use Cake\ORM\SaveOptionsBuilder;
 use Cake\ORM\Table;
-use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
 /**
diff --git a/tests/TestCase/ORM/TableRegressionTest.php b/tests/TestCase/ORM/TableRegressionTest.php
index 59c439221a4..6a034f2bfe7 100644
--- a/tests/TestCase/ORM/TableRegressionTest.php
+++ b/tests/TestCase/ORM/TableRegressionTest.php
@@ -14,8 +14,6 @@
  */
 namespace Cake\Test\TestCase\ORM;
 
-use Cake\Core\Plugin;
-use Cake\I18n\Time;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
diff --git a/tests/TestCase/Routing/Middleware/AssetMiddlewareTest.php b/tests/TestCase/Routing/Middleware/AssetMiddlewareTest.php
index 52cba737ac4..b0e78adbc80 100644
--- a/tests/TestCase/Routing/Middleware/AssetMiddlewareTest.php
+++ b/tests/TestCase/Routing/Middleware/AssetMiddlewareTest.php
@@ -18,7 +18,6 @@
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Middleware\AssetMiddleware;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 
 /**
diff --git a/tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php b/tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php
index 039ebb3c9be..498e8a83d33 100644
--- a/tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php
+++ b/tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php
@@ -17,7 +17,6 @@
 use Cake\Routing\Middleware\RoutingMiddleware;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
 
diff --git a/tests/TestCase/Routing/Route/RedirectRouteTest.php b/tests/TestCase/Routing/Route/RedirectRouteTest.php
index ecaef92ff10..327b07c1e48 100644
--- a/tests/TestCase/Routing/Route/RedirectRouteTest.php
+++ b/tests/TestCase/Routing/Route/RedirectRouteTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Routing\Route;
 
-use Cake\Core\Configure;
 use Cake\Routing\Router;
 use Cake\Routing\Route\RedirectRoute;
 use Cake\TestSuite\TestCase;
diff --git a/tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php b/tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php
index 65a4bdef147..136d9fce9b4 100644
--- a/tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php
+++ b/tests/TestCase/TestSuite/CookieEncryptedUsingControllerTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\Controller;
 
-use Cake\Controller\Component;
 use Cake\Core\Configure;
 use Cake\Routing\DispatcherFactory;
 use Cake\Routing\Router;
diff --git a/tests/TestCase/Validation/ValidationTest.php b/tests/TestCase/Validation/ValidationTest.php
index 81d9687fd0d..2d6898da211 100644
--- a/tests/TestCase/Validation/ValidationTest.php
+++ b/tests/TestCase/Validation/ValidationTest.php
@@ -20,7 +20,6 @@
 use Cake\I18n\I18n;
 use Cake\TestSuite\TestCase;
 use Cake\Validation\Validation;
-use Cake\Validation\Validator;
 use Locale;
 use stdClass;
 use Zend\Diactoros\UploadedFile;
diff --git a/tests/TestCase/View/Helper/TimeHelperTest.php b/tests/TestCase/View/Helper/TimeHelperTest.php
index a6d97afd021..638342542df 100644
--- a/tests/TestCase/View/Helper/TimeHelperTest.php
+++ b/tests/TestCase/View/Helper/TimeHelperTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\View\Helper;
 
-use Cake\Core\Configure;
 use Cake\I18n\I18n;
 use Cake\I18n\Time;
 use Cake\TestSuite\TestCase;
diff --git a/tests/TestCase/View/HelperTest.php b/tests/TestCase/View/HelperTest.php
index 9533bb973d7..30e2401763c 100644
--- a/tests/TestCase/View/HelperTest.php
+++ b/tests/TestCase/View/HelperTest.php
@@ -18,7 +18,6 @@
 
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
-use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use Cake\View\Helper;