diff --git a/spec/support/request/checkout_request_helper.rb b/spec/support/request/checkout_request_helper.rb
index 94b1584f82..7170032bc5 100644
--- a/spec/support/request/checkout_request_helper.rb
+++ b/spec/support/request/checkout_request_helper.rb
@@ -33,17 +33,29 @@ module CheckoutRequestsHelper
   end
 
   def fill_out_form(shipping_method_name, payment_method_name, save_default_addresses: true)
-    choose shipping_method_name
-    choose payment_method_name
+    
+    within "#shipping" do
+      choose shipping_method_name
+    end
+    
+    within "#payment" do
+      choose payment_method_name
+    end
 
     fill_out_details
-    check "Save as default billing address" if save_default_addresses
+    
+    within "#billing" do
+     check "Save as default billing address" if save_default_addresses
+    end
 
     fill_out_billing_address
 
     return unless save_default_addresses
 
-    check "Shipping address same as billing address?"
-    check "Save as default shipping address"
+    within "#shipping" do
+      find(:xpath, '//*[@id="shipping"]/ng-form/dd').click
+      check "Shipping address same as billing address?"
+      check "Save as default shipping address"
+    end
   end
 end
diff --git a/spec/system/consumer/shopping/checkout_spec.rb b/spec/system/consumer/shopping/checkout_spec.rb
index 046fd19e64..b2eec21a14 100644
--- a/spec/system/consumer/shopping/checkout_spec.rb
+++ b/spec/system/consumer/shopping/checkout_spec.rb
@@ -313,8 +313,11 @@ describe "As a consumer I want to check out my cart", js: true do
 
       it "checks out successfully" do
         visit checkout_path
+        
         expect(page).to have_content "Shipping info"
+        find(:xpath, '//*[@id="shipping"]/ng-form/dd').click
         find("input[value='#{shipping_with_fee.id}'").click
+        click_button "Next"
         expect(page).to have_content "Payment"
         find("input[value='#{check_without_fee.id}'").click