diff --git a/templates/bake/tests/test_case.twig b/templates/bake/tests/test_case.twig
index 87d36c75..464f308b 100644
--- a/templates/bake/tests/test_case.twig
+++ b/templates/bake/tests/test_case.twig
@@ -35,7 +35,7 @@
  * {{ fullClassName }} Test Case
 {% if isController or isCommand %}
  *
- * @uses \{{ fullClassName }}
+ * @link \{{ fullClassName }}
 {% endif %}
  */
 class {{ className }}Test extends TestCase
@@ -123,7 +123,7 @@ class {{ className }}Test extends TestCase
      * Test {{ method }} method
      *
      * @return void
-     * @uses \{{ fullClassName }}::{{ method }}()
+     * @link \{{ fullClassName }}::{{ method }}()
      */
     public function test{{ method|camelize }}(): void
     {
diff --git a/tests/TestCase/Command/AllCommandTest.php b/tests/TestCase/Command/AllCommandTest.php
index d34b6001..7e30df80 100644
--- a/tests/TestCase/Command/AllCommandTest.php
+++ b/tests/TestCase/Command/AllCommandTest.php
@@ -187,11 +187,11 @@ public function testExecuteWithPrefix()
     }
 
     /**
-     * Test docblock @ uses generated for test methods
+     * Test docblock @ link generated for test methods
      *
      * @return void
      */
-    public function testGenerateUsesDocBlockController()
+    public function testGenerateLinkDocBlockController()
     {
         $path = APP;
         $testsPath = ROOT . 'tests' . DS;
@@ -213,11 +213,11 @@ public function testGenerateUsesDocBlockController()
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileContains(
-            '@uses \Bake\Test\App\Controller\ProductsController::index()',
+            '@link \Bake\Test\App\Controller\ProductsController::index()',
             $testsPath . 'TestCase/Controller/ProductsControllerTest.php',
         );
         $this->assertFileContains(
-            '@uses \Bake\Test\App\Model\Table\ProductsTable::validationDefault()',
+            '@link \Bake\Test\App\Model\Table\ProductsTable::validationDefault()',
             $testsPath . 'TestCase/Model/Table/ProductsTableTest.php',
         );
         $this->assertOutputContains('Bake All complete');
diff --git a/tests/TestCase/Command/CommandCommandTest.php b/tests/TestCase/Command/CommandCommandTest.php
index 97e6d679..4f049845 100644
--- a/tests/TestCase/Command/CommandCommandTest.php
+++ b/tests/TestCase/Command/CommandCommandTest.php
@@ -113,11 +113,11 @@ public function testGenerateUsesDocBlock()
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileContains(
-            '@uses \Bake\Test\App\Command\DocblockCommand::buildOptionParser()',
+            '@link \Bake\Test\App\Command\DocblockCommand::buildOptionParser()',
             $testsPath . 'TestCase/Command/DocblockCommandTest.php',
         );
         $this->assertFileContains(
-            '@uses \Bake\Test\App\Command\DocblockCommand::execute()',
+            '@link \Bake\Test\App\Command\DocblockCommand::execute()',
             $testsPath . 'TestCase/Command/DocblockCommandTest.php',
         );
     }
@@ -142,11 +142,11 @@ public function testGenerateUsesDocBlockPlugin()
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileContains(
-            '@uses \BakeTest\Command\DocblockCommand::buildOptionParser()',
+            '@link \BakeTest\Command\DocblockCommand::buildOptionParser()',
             $testsPath . 'TestCase/Command/DocblockCommandTest.php',
         );
         $this->assertFileContains(
-            '@uses \BakeTest\Command\DocblockCommand::execute()',
+            '@link \BakeTest\Command\DocblockCommand::execute()',
             $testsPath . 'TestCase/Command/DocblockCommandTest.php',
         );
     }
diff --git a/tests/TestCase/Command/TestCommandTest.php b/tests/TestCase/Command/TestCommandTest.php
index 576f6d8c..41db8451 100644
--- a/tests/TestCase/Command/TestCommandTest.php
+++ b/tests/TestCase/Command/TestCommandTest.php
@@ -735,7 +735,7 @@ public function testGenerateUsesDocBlockController()
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileContains(
-            '@uses \Bake\Test\App\Controller\ProductsController::index()',
+            '@link \Bake\Test\App\Controller\ProductsController::index()',
             $testsPath . 'TestCase/Controller/ProductsControllerTest.php',
         );
     }
@@ -757,7 +757,7 @@ public function testGenerateUsesDocBlockTable()
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileContains(
-            '@uses \Bake\Test\App\Model\Table\ProductsTable::validationDefault()',
+            '@link \Bake\Test\App\Model\Table\ProductsTable::validationDefault()',
             $testsPath . 'TestCase/Model/Table/ProductsTableTest.php',
         );
     }
diff --git a/tests/comparisons/Test/testBakeCommandHelperTest.php b/tests/comparisons/Test/testBakeCommandHelperTest.php
index c9bd6629..f571261a 100644
--- a/tests/comparisons/Test/testBakeCommandHelperTest.php
+++ b/tests/comparisons/Test/testBakeCommandHelperTest.php
@@ -63,7 +63,7 @@ protected function tearDown(): void
      * Test output method
      *
      * @return void
-     * @uses \Bake\Test\App\Command\Helper\ErrorHelper::output()
+     * @link \Bake\Test\App\Command\Helper\ErrorHelper::output()
      */
     public function testOutput(): void
     {
diff --git a/tests/comparisons/Test/testBakeCommandTest.php b/tests/comparisons/Test/testBakeCommandTest.php
index 56d653be..fd3ea530 100644
--- a/tests/comparisons/Test/testBakeCommandTest.php
+++ b/tests/comparisons/Test/testBakeCommandTest.php
@@ -10,7 +10,7 @@
 /**
  * Bake\Test\App\Command\OtherExampleCommand Test Case
  *
- * @uses \Bake\Test\App\Command\OtherExampleCommand
+ * @link \Bake\Test\App\Command\OtherExampleCommand
  */
 class OtherExampleCommandTest extends TestCase
 {
diff --git a/tests/comparisons/Test/testBakeComponentTest.php b/tests/comparisons/Test/testBakeComponentTest.php
index fab9cdfb..e6a66949 100644
--- a/tests/comparisons/Test/testBakeComponentTest.php
+++ b/tests/comparisons/Test/testBakeComponentTest.php
@@ -47,7 +47,7 @@ protected function tearDown(): void
      * Test startup method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\Component\AppleComponent::startup()
+     * @link \Bake\Test\App\Controller\Component\AppleComponent::startup()
      */
     public function testStartup(): void
     {
diff --git a/tests/comparisons/Test/testBakeControllerTest.php b/tests/comparisons/Test/testBakeControllerTest.php
index 71561048..73c45761 100644
--- a/tests/comparisons/Test/testBakeControllerTest.php
+++ b/tests/comparisons/Test/testBakeControllerTest.php
@@ -10,7 +10,7 @@
 /**
  * Bake\Test\App\Controller\PostsController Test Case
  *
- * @uses \Bake\Test\App\Controller\PostsController
+ * @link \Bake\Test\App\Controller\PostsController
  */
 class PostsControllerTest extends TestCase
 {
@@ -29,7 +29,7 @@ class PostsControllerTest extends TestCase
      * Test index method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\PostsController::index()
+     * @link \Bake\Test\App\Controller\PostsController::index()
      */
     public function testIndex(): void
     {
diff --git a/tests/comparisons/Test/testBakeControllerWithoutModelTest.php b/tests/comparisons/Test/testBakeControllerWithoutModelTest.php
index 0304d44d..54f42e26 100644
--- a/tests/comparisons/Test/testBakeControllerWithoutModelTest.php
+++ b/tests/comparisons/Test/testBakeControllerWithoutModelTest.php
@@ -10,7 +10,7 @@
 /**
  * Bake\Test\App\Controller\NoModelController Test Case
  *
- * @uses \Bake\Test\App\Controller\NoModelController
+ * @link \Bake\Test\App\Controller\NoModelController
  */
 class NoModelControllerTest extends TestCase
 {
@@ -20,7 +20,7 @@ class NoModelControllerTest extends TestCase
      * Test index method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\NoModelController::index()
+     * @link \Bake\Test\App\Controller\NoModelController::index()
      */
     public function testIndex(): void
     {
diff --git a/tests/comparisons/Test/testBakeModelTest.php b/tests/comparisons/Test/testBakeModelTest.php
index 0a8f7702..1f5d6a98 100644
--- a/tests/comparisons/Test/testBakeModelTest.php
+++ b/tests/comparisons/Test/testBakeModelTest.php
@@ -58,7 +58,7 @@ protected function tearDown(): void
      * Test findPublished method
      *
      * @return void
-     * @uses \Bake\Test\App\Model\Table\ArticlesTable::findPublished()
+     * @link \Bake\Test\App\Model\Table\ArticlesTable::findPublished()
      */
     public function testFindPublished(): void
     {
@@ -69,7 +69,7 @@ public function testFindPublished(): void
      * Test doSomething method
      *
      * @return void
-     * @uses \Bake\Test\App\Model\Table\ArticlesTable::doSomething()
+     * @link \Bake\Test\App\Model\Table\ArticlesTable::doSomething()
      */
     public function testDoSomething(): void
     {
@@ -80,7 +80,7 @@ public function testDoSomething(): void
      * Test doSomethingElse method
      *
      * @return void
-     * @uses \Bake\Test\App\Model\Table\ArticlesTable::doSomethingElse()
+     * @link \Bake\Test\App\Model\Table\ArticlesTable::doSomethingElse()
      */
     public function testDoSomethingElse(): void
     {
diff --git a/tests/comparisons/Test/testBakePrefixControllerTest.php b/tests/comparisons/Test/testBakePrefixControllerTest.php
index 1920ddf8..5c464445 100644
--- a/tests/comparisons/Test/testBakePrefixControllerTest.php
+++ b/tests/comparisons/Test/testBakePrefixControllerTest.php
@@ -10,7 +10,7 @@
 /**
  * Bake\Test\App\Controller\Admin\PostsController Test Case
  *
- * @uses \Bake\Test\App\Controller\Admin\PostsController
+ * @link \Bake\Test\App\Controller\Admin\PostsController
  */
 class PostsControllerTest extends TestCase
 {
@@ -29,7 +29,7 @@ class PostsControllerTest extends TestCase
      * Test index method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\Admin\PostsController::index()
+     * @link \Bake\Test\App\Controller\Admin\PostsController::index()
      */
     public function testIndex(): void
     {
@@ -40,7 +40,7 @@ public function testIndex(): void
      * Test add method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\Admin\PostsController::add()
+     * @link \Bake\Test\App\Controller\Admin\PostsController::add()
      */
     public function testAdd(): void
     {
diff --git a/tests/comparisons/Test/testBakePrefixControllerTestWithCliOption.php b/tests/comparisons/Test/testBakePrefixControllerTestWithCliOption.php
index 1920ddf8..5c464445 100644
--- a/tests/comparisons/Test/testBakePrefixControllerTestWithCliOption.php
+++ b/tests/comparisons/Test/testBakePrefixControllerTestWithCliOption.php
@@ -10,7 +10,7 @@
 /**
  * Bake\Test\App\Controller\Admin\PostsController Test Case
  *
- * @uses \Bake\Test\App\Controller\Admin\PostsController
+ * @link \Bake\Test\App\Controller\Admin\PostsController
  */
 class PostsControllerTest extends TestCase
 {
@@ -29,7 +29,7 @@ class PostsControllerTest extends TestCase
      * Test index method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\Admin\PostsController::index()
+     * @link \Bake\Test\App\Controller\Admin\PostsController::index()
      */
     public function testIndex(): void
     {
@@ -40,7 +40,7 @@ public function testIndex(): void
      * Test add method
      *
      * @return void
-     * @uses \Bake\Test\App\Controller\Admin\PostsController::add()
+     * @link \Bake\Test\App\Controller\Admin\PostsController::add()
      */
     public function testAdd(): void
     {