diff --git a/spec/features/stripe_checkout_spec.rb b/spec/features/stripe_checkout_spec.rb
index f0df05b9..1f16f25e 100644
--- a/spec/features/stripe_checkout_spec.rb
+++ b/spec/features/stripe_checkout_spec.rb
@@ -271,7 +271,9 @@
             expect(page).to have_content "Completed"
           end
 
-          find('input[value="Cancel"]').click
+          page.accept_alert do
+            find('input[value="Cancel"]').click
+          end
 
           expect(page).to have_content "Order canceled"
 
@@ -396,7 +398,9 @@
             expect(page).to have_content "Completed"
           end
 
-          find('input[value="Cancel"]').click
+          page.accept_alert do
+            find('input[value="Cancel"]').click
+          end
 
           expect(page).to have_content "Order canceled"
 
@@ -471,7 +475,7 @@
   end
 
   def within_3d_secure_modal
-    within_frame "__privateStripeFrame11" do
+    within_frame find("iframe[src*='authorize-with-url-inner']") do
       within_frame "__stripeJSChallengeFrame" do
         within_frame "acsFrame" do
           yield
diff --git a/spec/models/solidus_stripe/create_intents_payment_service_spec.rb b/spec/models/solidus_stripe/create_intents_payment_service_spec.rb
index cdc697ee..f14a278c 100644
--- a/spec/models/solidus_stripe/create_intents_payment_service_spec.rb
+++ b/spec/models/solidus_stripe/create_intents_payment_service_spec.rb
@@ -96,7 +96,7 @@
 
     context "when there are previous pending payments" do
       let!(:payment) do
-        create(:payment, order: order).tap do |payment|
+        create(:payment, order: order, amount: order.total).tap do |payment|
           payment.update!(state: :pending)
         end
       end