diff --git a/spec/factories/budgets.rb b/spec/factories/budgets.rb
index 3f6e637ba..b1942cf08 100644
--- a/spec/factories/budgets.rb
+++ b/spec/factories/budgets.rb
@@ -173,6 +173,10 @@ FactoryBot.define do
       administrator
     end
 
+    trait :with_valuator do
+      valuators { [create(:valuator)] }
+    end
+
     trait :flagged do
       after :create do |investment|
         Flag.flag(create(:user), investment)
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 0f313b04b..8a83e4ce4 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -447,8 +447,7 @@ describe "Admin budget investments" do
 
     scenario "Filtering by assignment status" do
       create(:budget_investment, :with_administrator, title: "Assigned idea", budget: budget)
-      create(:budget_investment, title: "Evaluating...", budget: budget,
-             valuators: [create(:valuator)])
+      create(:budget_investment, :with_valuator, title: "Evaluating...", budget: budget)
       create(:budget_investment, title: "With group", budget: budget,
              valuator_groups: [create(:valuator_group)])
 
@@ -1652,10 +1651,10 @@ describe "Admin budget investments" do
     end
 
     scenario "Showing the valuating checkbox" do
-      investment1 = create(:budget_investment, :with_administrator, :visible_to_valuators,
-                           budget: budget, valuators: [create(:valuator)])
-      investment2 = create(:budget_investment, :with_administrator, :invisible_to_valuators,
-                           budget: budget, valuators: [create(:valuator), create(:valuator)])
+      investment1 = create(:budget_investment, :with_administrator, :with_valuator, :visible_to_valuators,
+                           budget: budget)
+      investment2 = create(:budget_investment, :with_administrator, :with_valuator, :invisible_to_valuators,
+                           budget: budget)
 
       visit admin_budget_budget_investments_path(budget)
 
diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb
index e6e25518b..01d812ea2 100644
--- a/spec/models/budget/investment_spec.rb
+++ b/spec/models/budget/investment_spec.rb
@@ -416,7 +416,7 @@ describe Budget::Investment do
 
     describe "managed" do
       it "returns all open investments with assigned admin but without assigned valuators" do
-        investment1 = create(:budget_investment, :with_administrator, valuators: [create(:valuator)])
+        investment1 = create(:budget_investment, :with_administrator, :with_valuator)
         investment2 = create(:budget_investment, :with_administrator, :finished)
         investment3 = create(:budget_investment, :with_administrator)
 
@@ -429,8 +429,8 @@ describe Budget::Investment do
     describe "valuating" do
       it "returns all investments with assigned valuator but valuation not finished" do
         investment1 = create(:budget_investment)
-        investment2 = create(:budget_investment, valuators: [create(:valuator)])
-        investment3 = create(:budget_investment, :finished, valuators: [create(:valuator)])
+        investment2 = create(:budget_investment, :with_valuator)
+        investment3 = create(:budget_investment, :with_valuator, :finished)
 
         valuating = Budget::Investment.valuating
 
@@ -454,8 +454,8 @@ describe Budget::Investment do
     describe "valuation_finished" do
       it "returns all investments with valuation finished" do
         investment1 = create(:budget_investment)
-        investment2 = create(:budget_investment, valuators: [create(:valuator)])
-        investment3 = create(:budget_investment, :finished, valuators: [create(:valuator)])
+        investment2 = create(:budget_investment, :with_valuator)
+        investment3 = create(:budget_investment, :with_valuator, :finished)
 
         valuation_finished = Budget::Investment.valuation_finished
 
@@ -1155,8 +1155,8 @@ describe Budget::Investment do
     describe "with under_valuation filter" do
       let(:params) { { advanced_filters: ["under_valuation"], budget_id: budget.id } }
       it "returns only investment under valuation" do
-        investment1 = create(:budget_investment, :with_administrator, :unfinished,
-                             budget: budget, valuators: [create(:valuator)])
+        investment1 = create(:budget_investment, :with_administrator, :unfinished, :with_valuator,
+                             budget: budget)
         create(:budget_investment, :with_administrator, budget: budget)
         create(:budget_investment, budget: budget)