diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index d16e428922..e9173d59a1 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -201,7 +201,7 @@ module Spree
     end
 
     def update_order
-      order.update!
+      order.reload.update!
     end
 
     # Necessary because some payment gateways will refuse payments with
diff --git a/spec/features/admin/payments_spec.rb b/spec/features/admin/payments_spec.rb
index 75b1de38c2..23baabd4ed 100644
--- a/spec/features/admin/payments_spec.rb
+++ b/spec/features/admin/payments_spec.rb
@@ -46,7 +46,7 @@ feature '
       )
     end
 
-    xit "creates the payment, completes the order, and updates payment and shipping states" do
+    it "creates the payment, completes the order, and updates payment and shipping states" do
       login_as_admin_and_visit spree.new_admin_order_payment_path order
 
       expect(page).to have_content "New Payment"