diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php
index 9d1966534..a53ba514d 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php
@@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Tools\Console;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Doctrine\ORM\Version;
 use Doctrine\Tests\DoctrineTestCase;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\HelperSet;
 
 /**
@@ -12,15 +13,50 @@ use Symfony\Component\Console\Helper\HelperSet;
  *
  * @covers \Doctrine\ORM\Tools\Console\ConsoleRunner
  */
-class ConsoleRunnerTest extends DoctrineTestCase
+final class ConsoleRunnerTest extends DoctrineTestCase
 {
-    public function testCreateApplication()
+    public function testCreateApplicationShouldReturnAnApplicationWithTheCorrectCommands() : void
     {
         $helperSet = new HelperSet();
         $app       = ConsoleRunner::createApplication($helperSet);
 
-        $this->assertInstanceOf('Symfony\Component\Console\Application', $app);
-        $this->assertSame($helperSet, $app->getHelperSet());
-        $this->assertEquals(Version::VERSION, $app->getVersion());
+        self::assertSame($helperSet, $app->getHelperSet());
+        self::assertEquals(Version::VERSION, $app->getVersion());
+
+        self::assertTrue($app->has('dbal:import'));
+        self::assertTrue($app->has('dbal:reserved-words'));
+        self::assertTrue($app->has('dbal:run-sql'));
+        self::assertTrue($app->has('orm:clear-cache:region:collection'));
+        self::assertTrue($app->has('orm:clear-cache:region:entity'));
+        self::assertTrue($app->has('orm:clear-cache:region:query'));
+        self::assertTrue($app->has('orm:clear-cache:metadata'));
+        self::assertTrue($app->has('orm:clear-cache:query'));
+        self::assertTrue($app->has('orm:clear-cache:result'));
+        self::assertTrue($app->has('orm:convert-d1-schema'));
+        self::assertTrue($app->has('orm:convert-mapping'));
+        self::assertTrue($app->has('orm:convert:d1-schema'));
+        self::assertTrue($app->has('orm:convert:mapping'));
+        self::assertTrue($app->has('orm:ensure-production-settings'));
+        self::assertTrue($app->has('orm:generate-entities'));
+        self::assertTrue($app->has('orm:generate-proxies'));
+        self::assertTrue($app->has('orm:generate-repositories'));
+        self::assertTrue($app->has('orm:generate:entities'));
+        self::assertTrue($app->has('orm:generate:proxies'));
+        self::assertTrue($app->has('orm:generate:repositories'));
+        self::assertTrue($app->has('orm:info'));
+        self::assertTrue($app->has('orm:mapping:describe'));
+        self::assertTrue($app->has('orm:run-dql'));
+        self::assertTrue($app->has('orm:schema-tool:create'));
+        self::assertTrue($app->has('orm:schema-tool:drop'));
+        self::assertTrue($app->has('orm:schema-tool:update'));
+        self::assertTrue($app->has('orm:validate-schema'));
+    }
+
+    public function testCreateApplicationShouldAppendGivenCommands() : void
+    {
+        $command = 'my:lovely-command';
+        $app     = ConsoleRunner::createApplication(new HelperSet(), [new Command($command)]);
+
+        self::assertTrue($app->has($command));
     }
 }