diff --git a/spec/factories/partner_user.rb b/spec/factories/partner_user.rb
deleted file mode 100644
index 7c719c7088..0000000000
--- a/spec/factories/partner_user.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-FactoryBot.define do
-  factory :partner_user, class: ::User do
-    name { "Partner User" }
-    sequence(:email) { |n| "partner___user_#{n}@example.com" }
-    password { "password!" }
-    password_confirmation { "password!" }
-    invitation_sent_at { Time.current - 1.day }
-    last_sign_in_at { Time.current }
-    transient do
-      partner { Partner.first || create(:partner) }
-    end
-    after(:create) do |user, evaluator|
-      user.add_role(Role::PARTNER, evaluator.partner)
-    end
-  end
-end
diff --git a/spec/factories/partners/user.rb b/spec/factories/partners/user.rb
deleted file mode 100644
index 26cd34591c..0000000000
--- a/spec/factories/partners/user.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-FactoryBot.define do
-  factory :partners_user, class: ::User do
-    name { "Partner User" }
-    sequence(:email) { |n| "partner_user_#{n}@example.com" }
-    password { "password!" }
-    password_confirmation { "password!" }
-    invitation_sent_at { Time.current - 1.day }
-    last_sign_in_at { Time.current }
-    transient do
-      partner { Partner.first || create(:partner) }
-    end
-    after(:create) do |instance, evaluator|
-      instance.add_role(Role::PARTNER, evaluator.partner)
-    end
-  end
-end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 5da60b25ce..6fd0a28ac2 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -51,6 +51,22 @@
       end
     end
 
+    factory :partners_user do
+      name { "Partner User" }
+      sequence(:email) { |n| "partner_user_#{n}@example.com" }
+      password { "password!" }
+      password_confirmation { "password!" }
+      invitation_sent_at { Time.current - 1.day }
+      last_sign_in_at { Time.current }
+      organization { nil }
+      transient do
+        partner { Partner.first || create(:partner) }
+      end
+      after(:create) do |instance, evaluator|
+        instance.add_role(Role::PARTNER, evaluator.partner)
+      end
+    end
+
     factory :organization_admin do
       name { "Very Organized Admin" }
       after(:create) do |user, evaluator|
diff --git a/spec/mailers/custom_devise_mailer_spec.rb b/spec/mailers/custom_devise_mailer_spec.rb
index cf497921c2..3aa6848039 100644
--- a/spec/mailers/custom_devise_mailer_spec.rb
+++ b/spec/mailers/custom_devise_mailer_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe CustomDeviseMailer, type: :mailer do
   describe "#invitation_instructions" do
-    let(:user) { create(:partner_user) }
+    let(:user) { create(:partners_user) }
     let(:mail) { described_class.invitation_instructions(user, SecureRandom.uuid) }
 
     context "when partner is invited" do
@@ -12,7 +12,7 @@
       end
 
       let(:user) do
-        create(:partner_user, partner: partner)
+        create(:partners_user, partner: partner)
       end
 
       it "invites to primary user" do
@@ -23,7 +23,7 @@
 
     context "when other partner users invited" do
       let(:partner) { create(:partner) }
-      let(:user) { create(:partner_user, partner: partner) }
+      let(:user) { create(:partners_user, partner: partner) }
 
       it "invites to partner user" do
         expect(mail.subject).to eq("You've been invited to #{user.partner.name}'s Human Essentials account")
diff --git a/spec/models/distribution_spec.rb b/spec/models/distribution_spec.rb
index bd47938136..025c07fc74 100644
--- a/spec/models/distribution_spec.rb
+++ b/spec/models/distribution_spec.rb
@@ -250,7 +250,7 @@
         item2 = create(:item, name: "Item2", organization: organization)
         request = create(:request,
           organization: organization,
-          partner_user: create(:partner_user),
+          partner_user: create(:partners_user),
           request_items: [
             { item_id: item1.id, quantity: 15 },
             { item_id: item2.id, quantity: 18 }
diff --git a/spec/models/users_role_spec.rb b/spec/models/users_role_spec.rb
index af0a6add7c..f9b3b07eb0 100644
--- a/spec/models/users_role_spec.rb
+++ b/spec/models/users_role_spec.rb
@@ -32,14 +32,14 @@
 
       context "for partner user" do
         it "should return partner user" do
-          user = create(:partner_user)
+          user = create(:partners_user)
           expect(UsersRole.current_role_for(user).name).to eq("partner")
         end
       end
     end
     context "when last_role is not nil" do
       it "should return last role" do
-        user = create(:partner_user)
+        user = create(:partners_user)
 
         UsersRole.set_last_role_for(user, user.roles.last)
 
@@ -52,7 +52,7 @@
   describe "#set_last_role_for" do
     context "when user has the role" do
       it "should set last role" do
-        user = create(:partner_user)
+        user = create(:partners_user)
         role = user.roles.first
 
         UsersRole.set_last_role_for(user, role)
@@ -63,7 +63,7 @@
 
     context "when user does not have the role" do
       it "should not set last role" do
-        user = create(:partner_user)
+        user = create(:partners_user)
         role = Role.find_by(name: "org_user")
 
         UsersRole.set_last_role_for(user, role)
diff --git a/spec/requests/sessions_requests_spec.rb b/spec/requests/sessions_requests_spec.rb
index b3688c29a2..e65661820c 100644
--- a/spec/requests/sessions_requests_spec.rb
+++ b/spec/requests/sessions_requests_spec.rb
@@ -23,7 +23,7 @@
   end
 
   describe "POST #create" do
-    let(:partner_user) { create(:partner_user) }
+    let(:partner_user) { create(:partners_user) }
     let(:partner_role) { partner_user.roles.first }
     let(:organization) { create(:organization) }
 
diff --git a/spec/requests/users_requests_spec.rb b/spec/requests/users_requests_spec.rb
index cf5bd3aeed..fa622ddbfa 100644
--- a/spec/requests/users_requests_spec.rb
+++ b/spec/requests/users_requests_spec.rb
@@ -25,7 +25,7 @@
 
   describe "POST #send_partner_user_reset_password" do
     let(:partner) { create(:partner, organization: organization) }
-    let!(:user) { create(:partner_user, partner: partner, email: "me@partner.com") }
+    let!(:user) { create(:partners_user, partner: partner, email: "me@partner.com") }
     let(:params) { { organization_name: organization.short_name, partner_id: partner.id, email: "me@partner.com" } }
 
     it "should send a password" do