diff --git a/tests/browser/features/language.feature b/tests/browser/features/language.feature
index d17d090..d85d30e 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -60,6 +60,7 @@ Feature: Language selection
   Scenario: Checking that the suggested language link has been created
     Given I go to a page that has languages
     And I click the switch-language page action
+    And I see the language overlay
     And I click on a language from the list of all languages
     And I click the browser back button
     And I see the language overlay
diff --git a/tests/browser/features/step_definitions/language_steps.rb b/tests/browser/features/step_definitions/language_steps.rb
index 676f917..0c2a435 100644
--- a/tests/browser/features/step_definitions/language_steps.rb
+++ b/tests/browser/features/step_definitions/language_steps.rb
@@ -7,7 +7,8 @@ When(/^I see the language overlay$/) do
 end
 
 When /^I click on a language from the list of all languages$/ do
-  on(ArticlePage).non_suggested_language_link_element.when_present.click
+  # API requests can sometimes take a long time so give additional time to verify this
+  on(ArticlePage).non_suggested_language_link_element.when_present(15).click
 end
 
 Then(/^I should not see the languages overlay$/) do
diff --git a/tests/browser/features/step_definitions/search_steps.rb b/tests/browser/features/step_definitions/search_steps.rb
index 3420aac..ecf734b 100644
--- a/tests/browser/features/step_definitions/search_steps.rb
+++ b/tests/browser/features/step_definitions/search_steps.rb
@@ -29,7 +29,7 @@ When(/^I click the search in pages button$/) do
 end
 
 When(/^I click a search watch star$/) do
-  on(ArticlePage).search_watchstars_element.when_present.click
+  on(ArticlePage).search_watchstars_element.when_present(15).click
 end
 
 When(/^I press the enter key$/) do
diff --git a/tests/browser/features/step_definitions/talk_steps.rb b/tests/browser/features/step_definitions/talk_steps.rb
index 911ed2c..831d373 100644
--- a/tests/browser/features/step_definitions/talk_steps.rb
+++ b/tests/browser/features/step_definitions/talk_steps.rb
@@ -19,12 +19,17 @@ When(/^I add a topic called "(.+)"$/) do |topic|
   end
 end
 
+When(/^I see the talk overlay$/) do
+  on(ArticlePage).overlay_element.when_visible
+end
+
 When(/^I click the add discussion button$/) do
   on(ArticlePage).talkadd_element.when_present.click
 end
 
 Then(/^I should see the topic called "(.+)" in the list of topics$/) do |topic|
-  expect(on(ArticlePage).talk_overlay_first_topic_title_element.when_present.text).to match topic
+  # Timeout is high as the previous action hits the API which may take some time
+  expect(on(ArticlePage).talk_overlay_first_topic_title_element.when_present(20).text).to match topic
 end
 
 Then(/^I should see the talk overlay$/) do
diff --git a/tests/browser/features/talk.feature b/tests/browser/features/talk.feature
index cf95b31..d81e04b 100644
--- a/tests/browser/features/talk.feature
+++ b/tests/browser/features/talk.feature
@@ -42,6 +42,7 @@ Feature: Talk
       And I am logged into the mobile website
       And the page "Selenium talk test" exists
     When I click the talk button
+    And I see the talk overlay
 	  And no topic is present
 	  And I add a topic called "New topic"
     Then I should see the topic called "New topic" in the list of topics