diff --git a/core/scripts/password-hash.php b/core/scripts/password-hash.php
index 9b69de539b..1c077a3afe 100644
--- a/core/scripts/password-hash.php
+++ b/core/scripts/password-hash.php
@@ -1,13 +1,19 @@
 #!/usr/bin/env php
 <?php
 
-use Drupal\Core\Console\Command\HashPasswordApplication;
+use Drupal\Core\Console\Command\HashPasswordCommand;
+use Symfony\Component\Console\Application;
 
 if (PHP_SAPI !== 'cli') {
   return;
 }
 
 include_once __DIR__ . '/bootstrap.php';
-// Run the hash password command.
-$application = new HashPasswordApplication($kernel->getContainer()->get('password'));
-$application->run();
+
+/** @var \Drupal\Core\Password\PasswordInterface $password */
+$password = $kernel->getContainer()->get('password');
+$application = (new Application())
+  ->add(new HashPasswordCommand($password))
+    ->getApplication()
+  ->setDefaultCommand('hash-password', true)
+  ->run();