diff --git a/spec/system/admin/users_spec.rb b/spec/system/admin/users_spec.rb
index 2b706846c8..5462654427 100644
--- a/spec/system/admin/users_spec.rb
+++ b/spec/system/admin/users_spec.rb
@@ -109,21 +109,24 @@ describe "Managing users" do
           user = Spree::User.find_by(email: "a@example.com")
 
           expect(page).to have_content "NO KEY"
-          find_button("Generate API key").click
-          expect(page).to have_content("Key generated")
+          expect {
+            click_button("Generate API key")
+            expect(page).to have_content("Key generated")
+          }.to change { user.reload.spree_api_key }.from(nil)
 
           expect(page).to have_unchecked_field "Show API key view for user"
-          expect(user.show_api_key_view).to be_falsey
 
-          check "Show API key view for user"
-          expect(page).to have_content("Show API key view has been changed!")
-          expect(page).to have_checked_field "Show API key view for user"
-          expect(user.reload.show_api_key_view).to be_truthy
+          expect {
+            check "Show API key view for user"
+            expect(page).to have_content("Show API key view has been changed!")
+            expect(page).to have_checked_field "Show API key view for user"
+          }.to change { user.reload.show_api_key_view }.from(false).to(true)
 
-          uncheck "Show API key view for user"
-          expect(page).to have_content("Show API key view has been changed!")
-          expect(page).to have_unchecked_field "Show API key view for user"
-          expect(user.reload.show_api_key_view).to be_falsey
+          expect {
+            uncheck "Show API key view for user"
+            expect(page).to have_content("Show API key view has been changed!")
+            expect(page).to have_unchecked_field "Show API key view for user"
+          }.to change { user.reload.show_api_key_view }.to(false)
         end
       end
     end