diff --git a/spec/controllers/admin/bulk_line_items_controller_spec.rb b/spec/controllers/admin/bulk_line_items_controller_spec.rb
index 553e796558..da05149079 100644
--- a/spec/controllers/admin/bulk_line_items_controller_spec.rb
+++ b/spec/controllers/admin/bulk_line_items_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Admin::BulkLineItemsController, type: :controller do
-  include AuthenticationWorkflow
-
   describe '#index' do
     render_views
 
@@ -17,7 +15,7 @@ describe Admin::BulkLineItemsController, type: :controller do
     let!(:line_item4) { FactoryBot.create(:line_item_with_shipment, order: order3) }
 
     context "as a normal user" do
-      before { allow(controller).to receive_messages spree_current_user: create_enterprise_user }
+      before { allow(controller).to receive_messages spree_current_user: create(:user) }
 
       it "should deny me access to the index action" do
         spree_get :index, format: :json
diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index c8a0a9ac29..c707fd759f 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -2,8 +2,6 @@ require 'spec_helper'
 require 'open_food_network/order_cycle_permissions'
 
 describe Admin::EnterprisesController, type: :controller do
-  include AuthenticationWorkflow
-
   let(:user) { create(:user) }
   let(:admin_user) { create(:admin_user) }
   let(:distributor_manager) { create(:user, enterprise_limit: 10, enterprises: [distributor]) }
@@ -366,18 +364,8 @@ describe Admin::EnterprisesController, type: :controller do
   end
 
   describe "bulk updating enterprises" do
-    let!(:original_owner) do
-      user = create_enterprise_user
-      user.enterprise_limit = 2
-      user.save!
-      user
-    end
-    let!(:new_owner) do
-      user = create_enterprise_user
-      user.enterprise_limit = 2
-      user.save!
-      user
-    end
+    let!(:original_owner) { create(:user) }
+    let!(:new_owner) { create(:user) }
     let!(:profile_enterprise1) { create(:enterprise, sells: 'none', owner: original_owner ) }
     let!(:profile_enterprise2) { create(:enterprise, sells: 'none', owner: original_owner ) }
 
@@ -441,7 +429,7 @@ describe Admin::EnterprisesController, type: :controller do
   end
 
   describe "for_order_cycle" do
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
     let!(:enterprise) { create(:enterprise, sells: 'any', owner: user) }
     let(:permission_mock) { double(:permission) }
 
@@ -487,7 +475,7 @@ describe Admin::EnterprisesController, type: :controller do
   end
 
   describe "visible" do
-    let!(:user) { create(:user, enterprise_limit: 10) }
+    let!(:user) { create(:user) }
     let!(:visible_enterprise) { create(:enterprise, sells: 'any', owner: user) }
     let!(:not_visible_enterprise) { create(:enterprise, sells: 'any') }
 
@@ -508,10 +496,10 @@ describe Admin::EnterprisesController, type: :controller do
   describe "index" do
     context "as super admin" do
       let(:super_admin) { create(:admin_user) }
-      let!(:user) { create_enterprise_user(enterprise_limit: 10) }
+      let!(:user) { create(:user) }
       let!(:enterprise1) { create(:enterprise, sells: 'any', owner: user) }
       let!(:enterprise2) { create(:enterprise, sells: 'own', owner: user) }
-      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create_enterprise_user ) }
+      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create(:user) ) }
 
       before do
         allow(controller).to receive_messages spree_current_user: super_admin
@@ -533,10 +521,10 @@ describe Admin::EnterprisesController, type: :controller do
     end
 
     context "as an enterprise user" do
-      let!(:user) { create_enterprise_user(enterprise_limit: 10) }
+      let!(:user) { create(:user) }
       let!(:enterprise1) { create(:enterprise, sells: 'any', owner: user) }
       let!(:enterprise2) { create(:enterprise, sells: 'own', owner: user) }
-      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create_enterprise_user ) }
+      let!(:enterprise3) { create(:enterprise, sells: 'any', owner: create(:user) ) }
 
       before do
         allow(controller).to receive_messages spree_current_user: user