diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index e13c3812a..3088a06c2 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -13,7 +13,7 @@ require "apartment/elevators/generic"
 #
 Apartment.configure do |config|
   ENV["IGNORE_EMPTY_TENANTS"] = "true" if Rails.env.test? || Rails.application.config.multitenancy.blank?
-  config.seed_after_create = true
+  config.seed_after_create = !Rails.env.test?
 
   # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
   # A typical example would be a Customer or Tenant model that stores each Tenant's information.
diff --git a/spec/lib/tasks/sitemap_spec.rb b/spec/lib/tasks/sitemap_spec.rb
index b6cc68c68..379b9c8a8 100644
--- a/spec/lib/tasks/sitemap_spec.rb
+++ b/spec/lib/tasks/sitemap_spec.rb
@@ -80,15 +80,18 @@ describe "rake sitemap:create", type: :system do
     create(:tenant, schema: "debates")
     create(:tenant, schema: "proposals")
 
+    Setting["process.budgets"] = true
     Setting["process.debates"] = false
     Setting["process.proposals"] = false
 
     Tenant.switch("debates") do
+      Setting["process.debates"] = true
       Setting["process.budgets"] = false
       Setting["process.proposals"] = false
     end
 
     Tenant.switch("proposals") do
+      Setting["process.proposals"] = true
       Setting["process.budgets"] = false
       Setting["process.debates"] = false
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 59c87016a..a2f22cf87 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -117,6 +117,14 @@ RSpec.configure do |config|
     Delayed::Worker.delay_jobs = false
   end
 
+  config.before(:each, :seed_tenants) do
+    Apartment.seed_after_create = true
+  end
+
+  config.after(:each, :seed_tenants) do
+    Apartment.seed_after_create = false
+  end
+
   config.before(:each, :small_window) do
     @window_size = Capybara.current_window.size
     Capybara.current_window.resize_to(639, 479)
diff --git a/spec/system/admin/tenants_spec.rb b/spec/system/admin/tenants_spec.rb
index 3dabdb7f4..4454fc6fc 100644
--- a/spec/system/admin/tenants_spec.rb
+++ b/spec/system/admin/tenants_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe "Tenants", :admin do
+describe "Tenants", :admin, :seed_tenants do
   before { allow(Tenant).to receive(:default_host).and_return("localhost") }
 
   scenario "Create" do
diff --git a/spec/system/multitenancy_spec.rb b/spec/system/multitenancy_spec.rb
index ef161fb9c..dd1f25e84 100644
--- a/spec/system/multitenancy_spec.rb
+++ b/spec/system/multitenancy_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe "Multitenancy" do
+describe "Multitenancy", :seed_tenants do
   before do
     create(:tenant, schema: "mars")
     create(:tenant, schema: "venus")