diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
index 7b758a053..cfc1da4bc 100644
--- a/spec/features/admin/poll/polls_spec.rb
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -318,10 +318,7 @@ feature "Admin polls" do
         unvoted_poll = create(:poll)
 
         voted_poll = create(:poll)
-        booth_assignment = create(:poll_booth_assignment, poll: voted_poll)
-        create(:poll_voter, :from_booth, :valid_document,
-               booth_assignment: booth_assignment,
-               poll: voted_poll)
+        create(:poll_voter, :from_booth, :valid_document, poll: voted_poll)
 
         visit admin_poll_results_path(unvoted_poll)
 
diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb
index 4fea6431c..ced234dd7 100644
--- a/spec/models/poll/poll_spec.rb
+++ b/spec/models/poll/poll_spec.rb
@@ -235,7 +235,7 @@ describe Poll do
       user = create(:user, :level_two)
       poll = create(:poll)
 
-      create(:poll_voter, poll: poll, user: user, origin: "booth")
+      create(:poll_voter, :from_booth, poll: poll, user: user)
 
       expect(poll.voted_in_booth?(user)).to be
     end
@@ -251,7 +251,7 @@ describe Poll do
       user = create(:user, :level_two)
       poll = create(:poll)
 
-      create(:poll_voter, poll: poll, user: user, origin: "web")
+      create(:poll_voter, :from_web, poll: poll, user: user)
 
       expect(poll.voted_in_booth?(user)).not_to be
     end
diff --git a/spec/models/poll/voter_spec.rb b/spec/models/poll/voter_spec.rb
index 466cbc891..85c72aa7d 100644
--- a/spec/models/poll/voter_spec.rb
+++ b/spec/models/poll/voter_spec.rb
@@ -76,7 +76,7 @@ describe Poll::Voter do
 
     it "is not valid if the user has voted via web" do
       answer = create(:poll_answer)
-      answer.record_voter_participation("token")
+      create(:poll_voter, :from_web, user: answer.author, poll: answer.poll)
 
       voter = build(:poll_voter, poll: answer.question.poll, user: answer.author)
       expect(voter).not_to be_valid
@@ -113,9 +113,9 @@ describe Poll::Voter do
 
     describe "#web" do
       it "returns voters with a web origin" do
-        voter1 = create(:poll_voter, origin: "web")
-        voter2 = create(:poll_voter, origin: "web")
-        voter3 = create(:poll_voter, origin: "booth")
+        voter1 = create(:poll_voter, :from_web)
+        voter2 = create(:poll_voter, :from_web)
+        voter3 = create(:poll_voter, :from_booth)
 
         web_voters = described_class.web
 
@@ -128,9 +128,9 @@ describe Poll::Voter do
 
     describe "#booth" do
       it "returns voters with a booth origin" do
-        voter1 = create(:poll_voter, origin: "booth")
-        voter2 = create(:poll_voter, origin: "booth")
-        voter3 = create(:poll_voter, origin: "web")
+        voter1 = create(:poll_voter, :from_booth)
+        voter2 = create(:poll_voter, :from_booth)
+        voter3 = create(:poll_voter, :from_web)
 
         booth_voters = described_class.booth