diff --git a/spec/system/management/budget_investments_spec.rb b/spec/system/management/budget_investments_spec.rb
index cba7b53f5..5bcf5d256 100644
--- a/spec/system/management/budget_investments_spec.rb
+++ b/spec/system/management/budget_investments_spec.rb
@@ -17,15 +17,6 @@ describe "Budget Investments" do
                   "Budget Investment created successfully.",
                   management: true
 
-  it_behaves_like "nested imageable",
-                  "budget_investment",
-                  "new_management_budget_investment_path",
-                  { budget_id: "budget_id" },
-                  "imageable_fill_new_valid_budget_investment",
-                  "Create Investment",
-                  "Budget Investment created successfully.",
-                  management: true
-
   it_behaves_like "mappable",
                   "budget_investment",
                   "investment",
diff --git a/spec/system/nested_imageable_spec.rb b/spec/system/nested_imageable_spec.rb
index 91d188f98..dbcdbc4da 100644
--- a/spec/system/nested_imageable_spec.rb
+++ b/spec/system/nested_imageable_spec.rb
@@ -14,7 +14,11 @@ describe "Nested imageable" do
   let(:path) do
     case factory
     when :budget then new_admin_budgets_wizard_budget_path
-    when :budget_investment then new_budget_investment_path(budget_id: imageable.budget_id)
+    when :budget_investment
+      [
+        new_budget_investment_path(budget_id: imageable.budget_id),
+        new_management_budget_investment_path(budget_id: imageable.budget_id)
+      ].sample
     when :future_poll_question_option then new_admin_option_image_path(option_id: imageable.id)
     when :proposal then new_proposal_path
     end
@@ -37,8 +41,8 @@ describe "Nested imageable" do
   end
 
   before do
-    create(:administrator, user: user) if [:budget, :future_poll_question_option].include?(factory)
-    login_as(user)
+    create(:administrator, user: user) if admin_section? || management_section?
+    do_login_for(user, management: management_section?)
     visit path
   end
 
@@ -237,4 +241,12 @@ describe "Nested imageable" do
     fill_in_ckeditor "Description", with: "Budget investment description"
     check :budget_investment_terms_of_service
   end
+
+  def admin_section?
+    path.starts_with?("/admin/")
+  end
+
+  def management_section?
+    path.starts_with?("/management/")
+  end
 end