diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index fcf0baebd9..872b50039f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -52,12 +52,16 @@ Spork.prefork do
       DatabaseCleaner.strategy = :transaction
     end
 
+    config.before(:each) do
+      DatabaseCleaner.start
+    end
+
     config.before(type: :request, js: true) do
       DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
     end
 
-    config.before(:each) do
-      DatabaseCleaner.start
+    config.before(js: false) do
+      DatabaseCleaner.strategy = :transaction
     end
 
     config.after(:each) do