diff --git a/templates/spec/support/solidus_starter_frontend/database_cleaner.rb b/templates/spec/support/solidus_starter_frontend/database_cleaner.rb
index 08f5d0c2..85013647 100644
--- a/templates/spec/support/solidus_starter_frontend/database_cleaner.rb
+++ b/templates/spec/support/solidus_starter_frontend/database_cleaner.rb
@@ -4,10 +4,13 @@
     DatabaseCleaner.clean_with :truncation
   end
 
-  # Around each spec check if it is a Javascript test and switch between using
-  # database transactions or not where necessary.
-  config.around(:each) do |example|
-    DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
-    DatabaseCleaner.cleaning { example.run }
+  # Set database cleaner strategy before test data is created
+  config.before(:each) do |example|
+    DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
   end
 end
diff --git a/templates/spec/system/coupon_code_spec.rb b/templates/spec/system/coupon_code_spec.rb
index 11ab9209..a149092d 100644
--- a/templates/spec/system/coupon_code_spec.rb
+++ b/templates/spec/system/coupon_code_spec.rb
@@ -47,8 +47,10 @@ def create_basic_coupon_promotion(code)
 
           # To shipping method screen
           click_button "Save and Continue"
+          expect(page).to have_content("Shipping Method")
           # To payment screen
           click_button "Save and Continue"
+          expect(page).to have_content("Payment Information")
         end
 
         it "informs about an invalid coupon code" do
@@ -102,8 +104,10 @@ def create_basic_coupon_promotion(code)
             # To shipping method screen, address is auto-populated
             # with user's saved addresses
             click_button "Save and Continue"
+            expect(page).to have_content("Shipping Method")
             # To payment screen
             click_button "Save and Continue"
+            expect(page).to have_content("Payment Information")
           end
 
           it "shows wallet payments on coupon code errors" do