diff --git a/composer.json b/composer.json
index f086412..356bb67 100755
--- a/composer.json
+++ b/composer.json
@@ -47,6 +47,7 @@
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "nette/finder": "^2.5",
         "tomasvotruba/cognitive-complexity": "^0.1.1",
+        "vimeo/psalm": "^5",
         "webflo/drupal-finder": "^1.3"
     },
     "autoload": {
@@ -55,7 +56,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.3"
+        "phpunit/phpunit": "9.6"
     },
     "config": {
         "allow-plugins": {
diff --git a/src/Drupal/DrupalAutoloader.php b/src/Drupal/DrupalAutoloader.php
index 9906f6f..9647df3 100644
--- a/src/Drupal/DrupalAutoloader.php
+++ b/src/Drupal/DrupalAutoloader.php
@@ -6,11 +6,11 @@
 
 use DrupalFinder\DrupalFinderComposerRuntime;
 use Drush\Drush;
-use mglaman\PHPStanDrupal\Drupal\Extension;
-use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery;
 use Nette\Utils\Finder;
 use PHPUnit\Framework\Test;
 use Symfony\Component\Yaml\Yaml;
+use mglaman\PHPStanDrupal\Drupal\Extension;
+use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery;
 
 /**
  * Drupal autoloader for allowing Psalm to scan code.
diff --git a/src/Drupal/DrupalAutoloaderBase.php b/src/Drupal/DrupalAutoloaderBase.php
index d218700..4e9554d 100644
--- a/src/Drupal/DrupalAutoloaderBase.php
+++ b/src/Drupal/DrupalAutoloaderBase.php
@@ -5,8 +5,8 @@
 namespace Wunderio\GrumPHP\Drupal;
 
 use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
-use mglaman\PHPStanDrupal\Drupal\Extension;
 use Nette\Utils\Finder;
+use mglaman\PHPStanDrupal\Drupal\Extension;
 
 /**
  * Drupal autoloader base class for allowing Psalm to scan code.
diff --git a/tests/AbstractLintTaskTest.php b/tests/AbstractLintTaskTest.php
index ddc325b..ba4196e 100644
--- a/tests/AbstractLintTaskTest.php
+++ b/tests/AbstractLintTaskTest.php
@@ -9,8 +9,8 @@
 
 use GrumPHP\Collection\FilesCollection;
 use GrumPHP\Collection\LintErrorsCollection;
-use GrumPHP\Linter\LinterInterface;
 use GrumPHP\Linter\LintError;
+use GrumPHP\Linter\LinterInterface;
 use GrumPHP\Runner\TaskResult;
 use GrumPHP\Task\Config\TaskConfigInterface;
 use GrumPHP\Task\Context\ContextInterface;