diff --git a/src/Commands/MigrateToolsCommands.php b/src/Commands/MigrateToolsCommands.php
index d1c5f0f..06891ec 100644
--- a/src/Commands/MigrateToolsCommands.php
+++ b/src/Commands/MigrateToolsCommands.php
@@ -121,7 +121,11 @@ class MigrateToolsCommands extends DrushCommands {
    * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
    *   Migrations status formatted as table.
    */
-  public function status($migration_names = '', array $options = []) {
+  public function status($migration_names = '', array $options = [
+    'group' => self::REQ,
+    'tag' => self::REQ,
+    'names-only' => FALSE,
+  ]) {
     $options += [
       'group' => NULL,
       'tag' => NULL,
@@ -278,7 +282,18 @@ class MigrateToolsCommands extends DrushCommands {
    * @throws \Exception
    *   If there are not enough parameters to the command.
    */
-  public function import($migration_names = '', array $options = []) {
+  public function import($migration_names = '', array $options = [
+    'all' => FALSE,
+    'group' => self::REQ,
+    'tag' => self::REQ,
+    'limit' => self::REQ,
+    'feedback' => self::REQ,
+    'idlist' => self::REQ,
+    'idlist-delimiter' => ':',
+    'update' => FALSE,
+    'force' => FALSE,
+    'execute-dependencies' => FALSE,
+  ]) {
     $options += [
       'all' => NULL,
       'group' => NULL,
@@ -368,7 +383,14 @@ class MigrateToolsCommands extends DrushCommands {
    * @throws \Exception
    *   If there are not enough parameters to the command.
    */
-  public function rollback($migration_names = '', array $options = []) {
+  public function rollback($migration_names = '', array $options = [
+    'all' => FALSE,
+    'group' => self::REQ,
+    'tag' => self::REQ,
+    'feedback' => self::REQ,
+    'idlist' => self::REQ,
+    'idlist-delimiter' => ':',
+  ]) {
     $options += [
       'all' => NULL,
       'group' => NULL,
@@ -544,7 +566,11 @@ class MigrateToolsCommands extends DrushCommands {
    * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
    *   Source fields of the given migration formatted as a table.
    */
-  public function messages($migration_id, array $options = []) {
+  public function messages($migration_id, array $options = [
+    'csv' => FALSE,
+    'idlist' => self::REQ,
+    'idlist-delimiter' => ':',
+  ]) {
     $options += [
       'csv' => NULL,
       'idlist' => NULL,
diff --git a/tests/src/Kernel/DrushTest.php b/tests/src/Kernel/DrushTest.php
index 7ecaa90..71465f8 100644
--- a/tests/src/Kernel/DrushTest.php
+++ b/tests/src/Kernel/DrushTest.php
@@ -73,7 +73,9 @@ class DrushTest extends MigrateTestBase {
     $this->installConfig('migrate_plus');
     $this->installConfig('migrate_tools_test');
     $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('user');
     $this->installSchema('system', ['key_value', 'key_value_expire']);
+    $this->installSchema('user', ['users_data']);
     $this->migrationPluginManager = $this->container->get('plugin.manager.migration');
     $this->logger = $this->container->get('logger.channel.migrate_tools');
     $this->commands = new MigrateToolsCommands(
@@ -90,7 +92,7 @@ class DrushTest extends MigrateTestBase {
   public function testStatus() {
     $this->executeMigration('fruit_terms');
     /** @var \Consolidation\OutputFormatters\StructuredData\RowsOfFields $result */
-    $result = $this->commands->status('fruit_terms');
+    $result = $this->commands->status('fruit_terms', []);
     $rows = $result->getArrayCopy();
     $this->assertSame(1, count($rows));
     $row = reset($rows);
@@ -98,6 +100,14 @@ class DrushTest extends MigrateTestBase {
     $this->assertSame(3, $row['total']);
     $this->assertSame(3, $row['imported']);
     $this->assertSame('Idle', $row['status']);
+
+    // Migrate status should not display migrate_drupal migrations if no source
+    // database is defined.
+    \Drupal::service('module_installer')->uninstall(['migrate_tools_test']);
+    $this->enableModules(['migrate_drupal']);
+    \Drupal::configFactory()->getEditable('migrate_plus.migration.fruit_terms')->delete();
+    $rows = $this->commands->status([]);
+    $this->assertEmpty($rows);
   }
 
   /**
@@ -120,7 +130,7 @@ class DrushTest extends MigrateTestBase {
     $id_map = $migration->getIdMap();
     $this->commands->import('fruit_terms', ['idlist' => 'Apple'] + $this->importBaseOptions);
     $this->assertSame(1, $id_map->importedCount());
-    $this->commands->import('fruit_terms');
+    $this->commands->import('fruit_terms', []);
     $this->assertSame(3, $id_map->importedCount());
     $this->commands->import('fruit_terms', ['idlist' => 'Apple', 'update' => TRUE] + $this->importBaseOptions);
     $this->assertSame(0, count($id_map->getRowsNeedingUpdate(100)));
@@ -148,7 +158,7 @@ class DrushTest extends MigrateTestBase {
     $id_map = $migration->getIdMap();
     $id_map->saveMessage(['name' => 'Apple'], $message);
     /** @var \Consolidation\OutputFormatters\StructuredData\RowsOfFields $result */
-    $result = $this->commands->messages('fruit_terms');
+    $result = $this->commands->messages('fruit_terms', []);
     $rows = $result->getArrayCopy();
     $this->assertSame($message, $rows[0]['message']);
   }
@@ -171,7 +181,7 @@ class DrushTest extends MigrateTestBase {
     $migration = $this->migrationPluginManager->createInstance('fruit_terms');
     $id_map = $migration->getIdMap();
     $this->assertSame(3, $id_map->importedCount());
-    $this->commands->rollback('fruit_terms');
+    $this->commands->rollback('fruit_terms', []);
     $this->assertSame(0, $id_map->importedCount());
   }
 
@@ -196,7 +206,7 @@ class DrushTest extends MigrateTestBase {
     /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
     $migration = $this->migrationPluginManager->createInstance('fruit_terms');
     $migration->setStatus(MigrationInterface::STATUS_IMPORTING);
-    $this->assertSame('Importing', $this->commands->status('fruit_terms')->getArrayCopy()[0]['status']);
+    $this->assertSame('Importing', $this->commands->status('fruit_terms', [])->getArrayCopy()[0]['status']);
     $this->commands->resetStatus('fruit_terms');
     $this->assertSame(MigrationInterface::STATUS_IDLE, $migration->getStatus());