diff --git a/src/Runtime/ServiceManager.php b/src/Runtime/ServiceManager.php
index 7af6733cb7..2ed1de40ee 100644
--- a/src/Runtime/ServiceManager.php
+++ b/src/Runtime/ServiceManager.php
@@ -206,7 +206,7 @@ public function discoverPsr4Commands(): array
 
         return array_filter($classes, function (string $class): bool {
             $reflectionClass = new \ReflectionClass($class);
-            return $reflectionClass->isSubclassOf(DrushCommands::class)
+            return ($reflectionClass->isSubclassOf(DrushCommands::class) || $reflectionClass->isSubclassOf(Command::class))
                 && !$reflectionClass->isAbstract()
                 && !$reflectionClass->isInterface()
                 && !$reflectionClass->isTrait();