diff --git a/spec/integration/account_migration_spec.rb b/spec/integration/account_migration_spec.rb
index aad22ffa8..6e5b6d740 100644
--- a/spec/integration/account_migration_spec.rb
+++ b/spec/integration/account_migration_spec.rb
@@ -15,7 +15,7 @@ def create_remote_contact(user, pod_host)
 end
 
 shared_examples_for "old person account is closed and profile is cleared" do
-  subject { old_user.person }
+  subject { old_person }
 
   before do
     run_migration
@@ -26,7 +26,7 @@ shared_examples_for "old person account is closed and profile is cleared" do
 end
 
 shared_examples_for "old person doesn't have any reference left" do
-  let(:person) { old_user.person }
+  let(:person) { old_person }
 
   before do
     DataGenerator.create(person, :generic_person_data)
@@ -320,7 +320,7 @@ describe "account migration" do
       let(:new_person) { new_user.person }
 
       def run_migration
-        AccountMigration.create!(old_person: old_user.person, new_person: new_user.person).perform!
+        AccountMigration.create!(old_person: old_person, new_person: new_person).perform!
       end
 
       include_examples "every migration scenario"
diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb
index a41f8d5f2..b0b304afb 100644
--- a/spec/models/account_migration_spec.rb
+++ b/spec/models/account_migration_spec.rb
@@ -87,8 +87,7 @@ describe AccountMigration, type: :model do
       end
 
       context "with local old user" do
-        let(:old_user) { FactoryGirl.create(:user) }
-        let(:old_person) { old_user.person }
+        let(:old_person) { FactoryGirl.create(:user).person }
 
         it "doesn't include old person" do
           expect(account_migration.subscribers).to be_empty
@@ -118,8 +117,7 @@ describe AccountMigration, type: :model do
     end
 
     context "with local old and remote new users" do
-      let(:old_user) { FactoryGirl.create(:user) }
-      let(:old_person) { old_user.person }
+      let(:old_person) { FactoryGirl.create(:user).person }
 
       it "calls AccountDeleter#close_user" do
         expect(embedded_account_deleter).to receive(:close_user)
@@ -136,8 +134,7 @@ describe AccountMigration, type: :model do
     context "with local new and remote old users" do
       let(:old_user) { remote_user_on_pod_c }
       let(:old_person) { old_user.person }
-      let(:new_user) { FactoryGirl.create(:user) }
-      let(:new_person) { new_user.person }
+      let(:new_person) { FactoryGirl.create(:user).person }
 
       it "dispatches account migration message" do
         expect(account_migration).to receive(:sender).twice.and_return(old_user)
@@ -159,10 +156,8 @@ describe AccountMigration, type: :model do
     end
 
     context "with local old and new users" do
-      let(:old_user) { FactoryGirl.create(:user) }
-      let(:old_person) { old_user.person }
-      let(:new_user) { FactoryGirl.create(:user) }
-      let(:new_person) { new_user.person }
+      let(:old_person) { FactoryGirl.create(:user).person }
+      let(:new_person) { FactoryGirl.create(:user).person }
 
       it "calls AccountDeleter#tombstone_user" do
         expect(embedded_account_deleter).to receive(:tombstone_user)
@@ -214,18 +209,18 @@ describe AccountMigration, type: :model do
       before do
         FactoryGirl.create(
           :aspect,
-          user: new_person.owner,
-          name: FactoryGirl.create(:aspect, user: old_person.owner).name
+          user: new_user,
+          name: FactoryGirl.create(:aspect, user: old_user).name
         )
         FactoryGirl.create(
           :contact,
-          user:   new_person.owner,
-          person: FactoryGirl.create(:contact, user: old_person.owner).person
+          user:   new_user,
+          person: FactoryGirl.create(:contact, user: old_user).person
         )
         FactoryGirl.create(
           :tag_following,
-          user: new_person.owner,
-          tag:  FactoryGirl.create(:tag_following, user: old_person.owner).tag
+          user: new_user,
+          tag:  FactoryGirl.create(:tag_following, user: old_user).tag
         )
       end
 
@@ -233,8 +228,8 @@ describe AccountMigration, type: :model do
         expect {
           account_migration.perform!
         }.not_to raise_error
-        expect(new_person.owner.contacts.count).to eq(1)
-        expect(new_person.owner.aspects.count).to eq(1)
+        expect(new_user.contacts.count).to eq(1)
+        expect(new_user.aspects.count).to eq(1)
       end
     end
   end