diff --git a/database/seeds/TestCompany.php b/database/seeds/TestCompany.php
index e915c8163..0029cfc94 100644
--- a/database/seeds/TestCompany.php
+++ b/database/seeds/TestCompany.php
@@ -55,6 +55,14 @@ class TestCompany extends Seeder
 
         session(['company_id' => $company->id]);
 
+        // Set Company settings
+        setting()->setExtraColumns(['company_id' => $company->id]);
+        setting()->forgetAll();
+        setting()->load(true);
+
+        setting()->set(['email.protocol' => 'array']);
+        setting()->save();
+
         $this->command->info('Test company created.');
     }
 
diff --git a/tests/Feature/FeatureTestCase.php b/tests/Feature/FeatureTestCase.php
index 9212a0b1d..7d30ddff8 100644
--- a/tests/Feature/FeatureTestCase.php
+++ b/tests/Feature/FeatureTestCase.php
@@ -26,16 +26,6 @@ abstract class FeatureTestCase extends TestCase
         $this->user = User::first();
         $this->company = $this->user->companies()->first();
 
-        session(['company_id' => $this->company->id]);
-
-        // Set Company settings
-        setting()->setExtraColumns(['company_id' => $this->company->id]);
-        setting()->forgetAll();
-        setting()->load(true);
-
-        setting()->set(['email.protocol' => 'array']);
-        setting()->save();
-
         // Disable debugbar
         config(['debugbar.enabled', false]);