1 files changed, 10 insertions, 2 deletions
diff --git a/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb b/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
index b155c20d8d3..cb52d971047 100644
--- a/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
+++ b/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
@@ -215,9 +215,17 @@ end
 # to a specific version of the database where said table is still present.
 #
 describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads, :migration, schema: 20170825154015 do
+  let(:user_class) do
+    Class.new(ActiveRecord::Base) do
+      self.table_name = 'users'
+    end
+  end
+
   let(:migration) { described_class.new }
-  let(:project) { create(:project_empty_repo) }
-  let(:author) { create(:user) }
+  let(:user_class) { table(:users) }
+  let(:author) { build(:user).becomes(user_class).tap(&:save!).becomes(User) }
+  let(:namespace) { create(:namespace, owner: author) }
+  let(:project) { create(:project_empty_repo, namespace: namespace, creator: author) }
 
   # We can not rely on FactoryGirl as the state of Event may change in ways that
   # the background migration does not expect, hence we use the Event class of