diff --git a/config/rector/sets/cakephp53.php b/config/rector/sets/cakephp53.php
index 518f53b1..cd091ed4 100644
--- a/config/rector/sets/cakephp53.php
+++ b/config/rector/sets/cakephp53.php
@@ -4,6 +4,7 @@
 use Cake\Upgrade\Rector\Rector\MethodCall\EntityIsEmptyRector;
 use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
+use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
 
 # @see https://book.cakephp.org/5/en/appendices/5-3-migration-guide.html
@@ -11,5 +12,8 @@
     $rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
         new MethodCallRename('Cake\Database\Query', 'newExpr', 'expr'),
     ]);
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        'Cake\ORM\Query' => 'Cake\ORM\Query\SelectQuery',
+    ]);
     $rectorConfig->rule(EntityIsEmptyRector::class);
 };
diff --git a/phpcs.xml b/phpcs.xml
index edd8538f..cf27827e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <ruleset name="CakePHP Upgrade">
-    <config name="installed_paths" value="../../cakephp/cakephp-codesniffer"/>
-
     <rule ref="CakePHP"/>
 
     <exclude-pattern>tests/test_apps</exclude-pattern>
diff --git a/tests/test_apps/original/RectorCommand-testApply53/src/SomeTest.php b/tests/test_apps/original/RectorCommand-testApply53/src/SomeTest.php
index d47952f0..5c9b6621 100644
--- a/tests/test_apps/original/RectorCommand-testApply53/src/SomeTest.php
+++ b/tests/test_apps/original/RectorCommand-testApply53/src/SomeTest.php
@@ -5,6 +5,7 @@
 
 use Cake\ORM\Entity;
 use Cake\ORM\Locator\LocatorAwareTrait;
+use Cake\ORM\Query;
 
 class SomeTest
 {
@@ -18,4 +19,8 @@ public function testRenames(): void
         $table = $this->fetchTable('Articles');
         $expr = $table->find()->newExpr();
     }
+
+    public function findSomething(Query $query, array $options): Query {
+        return $query;
+    }
 }
diff --git a/tests/test_apps/upgraded/RectorCommand-testApply53/src/SomeTest.php b/tests/test_apps/upgraded/RectorCommand-testApply53/src/SomeTest.php
index 1af58761..20659f65 100644
--- a/tests/test_apps/upgraded/RectorCommand-testApply53/src/SomeTest.php
+++ b/tests/test_apps/upgraded/RectorCommand-testApply53/src/SomeTest.php
@@ -5,6 +5,7 @@
 
 use Cake\ORM\Entity;
 use Cake\ORM\Locator\LocatorAwareTrait;
+use Cake\ORM\Query;
 
 class SomeTest
 {
@@ -18,4 +19,8 @@ public function testRenames(): void
         $table = $this->fetchTable('Articles');
         $expr = $table->find()->expr();
     }
+
+    public function findSomething(\Cake\ORM\Query\SelectQuery $query, array $options): \Cake\ORM\Query\SelectQuery {
+        return $query;
+    }
 }