diff --git a/spec/factories/oidc_account_factory.rb b/spec/factories/oidc_account_factory.rb
new file mode 100644
index 0000000000..4b0e12130f
--- /dev/null
+++ b/spec/factories/oidc_account_factory.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :oidc_account, class: OidcAccount do
+    provider { "openid_connect" }
+    uid { user&.email || generate(:random_email) }
+
+    # This is a live test account authenticated via Les Communes.
+    factory :testdfc_account do
+      uid { "testdfc@protonmail.com" }
+      refresh_token { ENV.fetch("OPENID_REFRESH_TOKEN") }
+      updated_at { 1.day.ago }
+    end
+  end
+end
diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb
index 0f978964b4..5646f839ab 100644
--- a/spec/factories/user_factory.rb
+++ b/spec/factories/user_factory.rb
@@ -39,20 +39,12 @@ FactoryBot.define do
     end
 
     factory :oidc_user do
-      oidc_account {
-        OidcAccount.new(provider: "openid_connect", uid: email)
-      }
+      oidc_account { build(:oidc_account, uid: email) }
     end
 
     # This is a live test user authenticated via Les Communes.
     factory :testdfc_user do
-      oidc_account {
-        OidcAccount.new(
-          uid: "testdfc@protonmail.com",
-          refresh_token: ENV.fetch("OPENID_REFRESH_TOKEN"),
-          updated_at: 1.day.ago,
-        )
-      }
+      oidc_account { build(:testdfc_account) }
     end
   end
 end