diff --git a/tests/src/Functional/SubPathautoFunctionalTest.php b/tests/src/Functional/SubPathautoFunctionalTest.php
index f135587..1b92606 100644
--- a/tests/src/Functional/SubPathautoFunctionalTest.php
+++ b/tests/src/Functional/SubPathautoFunctionalTest.php
@@ -3,12 +3,11 @@
 namespace Drupal\Tests\subpathauto\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Class SubPathautoFunctionalTest
+ * Class SubPathautoFunctionalTest.
+ *
  * @group subpathauto
  */
 class SubPathautoFunctionalTest extends BrowserTestBase {
@@ -16,7 +15,14 @@ class SubPathautoFunctionalTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['subpathauto', 'node', 'user', 'block', 'text', 'language'];
+  public static $modules = [
+    'subpathauto',
+    'node',
+    'user',
+    'block',
+    'text',
+    'language',
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/tests/src/Kernel/SubPathautoKernelTest.php b/tests/src/Kernel/SubPathautoKernelTest.php
index 610b327..f6db606 100644
--- a/tests/src/Kernel/SubPathautoKernelTest.php
+++ b/tests/src/Kernel/SubPathautoKernelTest.php
@@ -20,7 +20,12 @@ class SubPathautoKernelTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['system', 'subpathauto', 'node', 'user'];
+  public static $modules = [
+    'system',
+    'subpathauto',
+    'node',
+    'user',
+  ];
 
   /**
    * @var \Drupal\Core\Path\AliasWhitelistInterface
diff --git a/tests/src/Unit/SubPathautoTest.php b/tests/src/Unit/SubPathautoTest.php
index 185ee58..ed0d7fd 100644
--- a/tests/src/Unit/SubPathautoTest.php
+++ b/tests/src/Unit/SubPathautoTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\subpathauto\Unit;
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
@@ -94,7 +93,7 @@ class SubPathautoTest extends UnitTestCase {
   public function testInboundSubPath() {
     $this->aliasProcessor->expects($this->any())
       ->method('processInbound')
-      ->will($this->returnCallback([$this, 'pathAliasCallback']));
+      ->willReturnCallback([$this, 'pathAliasCallback']);
     $this->pathValidator->expects($this->any())
       ->method('getUrlIfValidWithoutAccessCheck')
       ->willReturn(new Url('any_route'));
@@ -142,7 +141,7 @@ class SubPathautoTest extends UnitTestCase {
 
     $this->aliasProcessor->expects($this->any())
       ->method('processInbound')
-      ->will($this->returnCallback([$this, 'pathAliasCallback']));
+      ->willReturnCallback([$this, 'pathAliasCallback']);
 
     // Subpath shouldn't be processed since the iterations has been limited.
     $processed = $this->sut->processInbound('/content/first-node/first/second/third/fourth', Request::create('/content/first-node/first/second/third/fourth'));
@@ -169,7 +168,7 @@ class SubPathautoTest extends UnitTestCase {
   public function testOutboundSubPath() {
     $this->aliasProcessor->expects($this->any())
       ->method('processOutbound')
-      ->will($this->returnCallback([$this, 'aliasByPathCallback']));
+      ->willReturnCallback([$this, 'aliasByPathCallback']);
     $this->subPathautoSettings->expects($this->atLeastOnce())
       ->method('get')
       ->willReturn(0);
@@ -209,7 +208,7 @@ class SubPathautoTest extends UnitTestCase {
 
     $this->aliasProcessor->expects($this->any())
       ->method('processOutbound')
-      ->will($this->returnCallback([$this, 'aliasByPathCallback']));
+      ->willReturnCallback([$this, 'aliasByPathCallback']);
 
     // Subpath shouldn't be processed since the iterations has been limited.
     $processed = $this->sut->processOutbound('/node/1/first/second/third/fourth');