diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index 76da72d81c..d29cd3d038 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -205,7 +205,7 @@ describe Spree::User do
   describe "#disabled=" do
     context 'when the value is truthy' do
       it "sets disabled datetime" do
-        user = create(:user)
+        user = Spree::User.new
         expect(user.disabled_at).to be_nil
         user.disabled = '1'
         expect(user.disabled_at).not_to be_nil
@@ -214,7 +214,7 @@ describe Spree::User do
 
     context 'when the value is falsey' do
       it "clears disabled datetime" do
-        user = create(:user, disabled_at: Time.zone.now)
+        user = Spree::User.new(disabled_at: Time.zone.now)
         expect(user.disabled_at).not_to be_nil
         user.disabled = '0'
         expect(user.disabled_at).to be_nil
@@ -224,13 +224,13 @@ describe Spree::User do
 
   describe "#disabled" do
     it "returns true with a disabled datetime" do
-      user = create(:user)
+      user = Spree::User.new
       user.disabled = '1'
       expect(user.disabled).to be_truthy
     end
 
     it "returns false without a disabled datetime" do
-      user = create(:user)
+      user = Spree::User.new(disabled_at: Time.zone.now)
       user.disabled = '0'
       expect(user.disabled).to be_falsey
     end
diff --git a/spec/system/admin/users_spec.rb b/spec/system/admin/users_spec.rb
index 647112a268..8c558436bf 100644
--- a/spec/system/admin/users_spec.rb
+++ b/spec/system/admin/users_spec.rb
@@ -91,12 +91,18 @@ describe "Managing users" do
           expect(page).to have_content "NO KEY"
         end
 
-        it "should allow to disable the user" do
+        it "should allow to disable the user and to enable it" do
+          expect(page).to have_unchecked_field "Disabled"
           check "Disabled"
           click_button "Update"
 
           expect(page).to have_content("Account updated")
           expect(page).to have_checked_field "Disabled"
+          uncheck "Disabled"
+          click_button "Update"
+
+          expect(page).to have_content("Account updated")
+          expect(page).to have_unchecked_field "Disabled"
         end
       end
     end