diff --git a/spec/features/consumer/account/cards_spec.rb b/spec/features/consumer/account/cards_spec.rb
index fe5884e58b..d2f6b673dd 100644
--- a/spec/features/consumer/account/cards_spec.rb
+++ b/spec/features/consumer/account/cards_spec.rb
@@ -39,7 +39,7 @@ feature "Credit Cards", js: true do
     it "passes the smoke test" do
       visit "/account"
 
-      click_link I18n.t('spree.users.show.tabs.cards')
+      find("a", :text => %r{#{I18n.t('spree.users.show.tabs.cards')}}i).click
 
       expect(page).to have_content I18n.t(:saved_cards)
 
diff --git a/spec/features/consumer/account/settings_spec.rb b/spec/features/consumer/account/settings_spec.rb
index 99abb4e52d..964a8d0fbe 100644
--- a/spec/features/consumer/account/settings_spec.rb
+++ b/spec/features/consumer/account/settings_spec.rb
@@ -18,7 +18,7 @@ feature "Account Settings", js: true do
       setup_email
       login_as user
       visit "/account"
-      click_link I18n.t('spree.users.show.tabs.settings')
+      find("a", :text => %r{#{I18n.t('spree.users.show.tabs.settings')}}i).click
       expect(page).to have_content I18n.t('spree.users.form.account_settings')
     end
 
@@ -37,7 +37,7 @@ feature "Account Settings", js: true do
       user.reload
       expect(user.email).to eq 'old@email.com'
       expect(user.unconfirmed_email).to eq 'new@email.com'
-      click_link I18n.t('spree.users.show.tabs.settings')
+      find("a", :text => %r{#{I18n.t('spree.users.show.tabs.settings')}}i).click
       expect(page).to have_content I18n.t('spree.users.show.unconfirmed_email',
                                           unconfirmed_email: 'new@email.com')
     end
diff --git a/spec/features/consumer/account_spec.rb b/spec/features/consumer/account_spec.rb
index 84cb4e3731..5e9d9543f5 100644
--- a/spec/features/consumer/account_spec.rb
+++ b/spec/features/consumer/account_spec.rb
@@ -54,7 +54,7 @@ feature '
                                   href: "#{distributor_credit.permalink}/shop", count: 1)
 
         # Viewing transaction history
-        click_link I18n.t('spree.users.show.tabs.transactions')
+        find("a", :text => %r{#{I18n.t('spree.users.show.tabs.transactions')}}i).click
 
         # It shows all hubs that have been ordered from with balance or credit
         expect(page).to have_content distributor1.name