diff --git a/tests/features/duckduckgoSearch.feature b/tests/features/duckduckgoSearch.feature
index 71599aa..c49226a 100644
--- a/tests/features/duckduckgoSearch.feature
+++ b/tests/features/duckduckgoSearch.feature
@@ -8,7 +8,7 @@ Background: Background name
 
 @duckduckgo
 Scenario: Searching DuckDuckGo
-  When I set "nightwatchjs" to the inputfield "#search_form_input_homepage"
+  When I set "nightwatchjs" to the inputfield "input[name=q]"
   And I press "ENTER"
-  Then I expect that container "#links" contains the text "Nightwatch.js"
+  Then I expect that container "#react-layout" contains the text "Nightwatch.js"
 
diff --git a/tests/features/githubSearch.feature b/tests/features/githubSearch.feature
index b6516ea..c4382bf 100644
--- a/tests/features/githubSearch.feature
+++ b/tests/features/githubSearch.feature
@@ -6,12 +6,12 @@ Feature: Github test
 Scenario: open URL
     Given I open the url "https://github.com/"
     Then  I expect the url to contain "github.com"
-    And   I expect that the title is "GitHub: Where the world builds software · GitHub"
+    And   I expect that the title is GitHub: Let’s build from here · GitHub"
 
+@githubSearch
 Scenario: search for nightwatch repository
     Given I open the url "https://github.com/search"
     And   I clear the inputfield "[placeholder='Search GitHub']"
     And   I add "nightwatch" to the inputfield "[placeholder='Search GitHub']"
     When  I press "ENTER"
-    Then  I expect that element ".header-search-input" contains the text "nightwatch"
-    And   I expect that container ".repo-list-item:first-child" contains the text "End-to-end testing framework written in Node.js and using the W3C Webdriver API"
+    Then  I expect that container "div[data-testid='results-list']:first-child" contains the text "end-to-end testing framework written in Node.js"