diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 872b50039f..c1334085e1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,22 +48,15 @@ Spork.prefork do
     #
     config.filter_run_excluding :skip => true
 
-    config.before(:suite) do
-      DatabaseCleaner.strategy = :transaction
-    end
-
     config.before(:each) do
+      if example.metadata[:js]
+        DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
+      else
+        DatabaseCleaner.strategy = :transaction
+      end
       DatabaseCleaner.start
     end
 
-    config.before(type: :request, js: true) do
-      DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
-    end
-
-    config.before(js: false) do
-      DatabaseCleaner.strategy = :transaction
-    end
-
     config.after(:each) do
       DatabaseCleaner.clean
     end