diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 758d046656..15f06b1b16 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -212,15 +212,15 @@ def seed_base_data_for_tests
   end
 
   config.before(:all) do
-    unless self.class.metadata[:skip_seed]
-      seed_base_data_for_tests
-      define_global_variables
+    unless Thread.current[:skipped_last_seeding]
+      DatabaseCleaner.clean_with(:truncation)
     end
-  end
 
-  config.after(:all) do
+    Thread.current[:skipped_last_seeding] = true
     unless self.class.metadata[:skip_seed]
-      DatabaseCleaner.clean_with(:truncation)
+      seed_base_data_for_tests
+      define_global_variables
+      Thread.current[:skipped_last_seeding] = false
     end
   end