diff --git a/app/Console/Commands/Environment/EmailSettingsCommand.php b/app/Console/Commands/Environment/EmailSettingsCommand.php
index 15f18b9b0..b67a5ed77 100644
--- a/app/Console/Commands/Environment/EmailSettingsCommand.php
+++ b/app/Console/Commands/Environment/EmailSettingsCommand.php
@@ -31,7 +31,7 @@ class EmailSettingsCommand extends Command
      */
     public function handle(): void
     {
-        $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
+        $this->variables['MAIL_MAILER'] = $this->option('driver') ?? $this->choice(
             trans('command/messages.environment.mail.ask_driver'),
             [
                 'log' => 'Log',
@@ -41,10 +41,10 @@ class EmailSettingsCommand extends Command
                 'mandrill' => 'Mandrill',
                 'postmark' => 'Postmark',
             ],
-            'smtp',
+            env('MAIL_MAILER', env('MAIL_DRIVER', 'smtp')),
         );
 
-        $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
+        $method = 'setup' . studly_case($this->variables['MAIL_MAILER']) . 'DriverVariables';
         if (method_exists($this, $method)) {
             $this->{$method}();
         }
diff --git a/phpunit.xml b/phpunit.xml
index a3f699ebd..28ecef304 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -17,7 +17,6 @@
     <env name="MAIL_MAILER" value="array"/>
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_CONNECTION" value="sync"/>
-    <env name="MAIL_DRIVER" value="array"/>
   </php>
   <source>
     <include>