diff --git a/spec/components/admin/budgets_wizard/headings/group_switcher_component_spec.rb b/spec/components/admin/budgets_wizard/headings/group_switcher_component_spec.rb
index 0392290f7..a0e0ee1cb 100644
--- a/spec/components/admin/budgets_wizard/headings/group_switcher_component_spec.rb
+++ b/spec/components/admin/budgets_wizard/headings/group_switcher_component_spec.rb
@@ -33,9 +33,9 @@ describe Admin::BudgetsWizard::Headings::GroupSwitcherComponent do
     expect(page).to have_content "Showing headings from the Parks group"
     expect(page).to have_button "Manage headings from a different group"
 
-    within "button + ul" do
-      expect(page).to have_link "Recreation"
-      expect(page).to have_link "Entertainment"
+    page.find("button + ul") do |list|
+      expect(list).to have_link "Recreation"
+      expect(list).to have_link "Entertainment"
     end
   end
 end
diff --git a/spec/components/budgets/budget_component_spec.rb b/spec/components/budgets/budget_component_spec.rb
index ad01643ae..98c0ef338 100644
--- a/spec/components/budgets/budget_component_spec.rb
+++ b/spec/components/budgets/budget_component_spec.rb
@@ -13,10 +13,10 @@ describe Budgets::BudgetComponent do
 
       render_inline Budgets::BudgetComponent.new(budget)
 
-      within(".budget-header") do
-        expect(page).to have_content("PARTICIPATORY BUDGETS")
-        expect(page).to have_content(budget.name)
-        expect(page).to have_link("Help with participatory budgets")
+      page.find(".budget-header") do |header|
+        expect(header).to have_content "Participatory budgets"
+        expect(header).to have_content budget.name
+        expect(header).to have_link "Help with participatory budgets"
       end
     end
 
diff --git a/spec/components/budgets/subheader_component_spec.rb b/spec/components/budgets/subheader_component_spec.rb
index 5ff750e71..cfccf8b83 100644
--- a/spec/components/budgets/subheader_component_spec.rb
+++ b/spec/components/budgets/subheader_component_spec.rb
@@ -7,9 +7,9 @@ describe Budgets::SubheaderComponent do
 
     render_inline Budgets::SubheaderComponent.new(budget)
 
-    within(".budget-subheader") do
-      expect(page).to have_content "CURRENT PHASE"
-      expect(page).to have_content "Information"
+    page.find(".budget-subheader") do |subheader|
+      expect(subheader).to have_content "Current phase"
+      expect(subheader).to have_content "Information"
     end
   end