diff --git a/features/edit_language_block.feature b/features/edit_language_block.feature
index 6455ab3..5fc6532 100644
--- a/features/edit_language_block.feature
+++ b/features/edit_language_block.feature
@@ -15,25 +15,25 @@ Feature: edit language of block
   Scenario: display in all languages
     Given I go to edit ArticleBlock of joaosilva
     And I fill in "Custom title for this block" with "Block displayed"
-    And I select "all languages"
+    And I select "all languages" from "Show for"
     And I press "Save"
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "Block displayed"
 
   Scenario: display in the selected language
     Given I go to edit LinkListBlock of joaosilva
     And I fill in "Custom title for this block" with "Block displayed"
-    And I select "English"
+    And I select "English" from "Show for"
     And I press "Save"
     And my browser prefers English
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "Block displayed"
 
   Scenario: not display in a not selected language
     Given I go to edit LinkListBlock of joaosilva
     And I fill in "Custom title for this block" with "Block not displayed"
-    And I select "English"
+    And I select "English" from "Show for"
     And I press "Save"
     And my browser prefers Portuguese
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should not see "Block displayed"
diff --git a/features/step_definitions/internationalization_steps.rb b/features/step_definitions/internationalization_steps.rb
index 92cde6f..250e9a5 100644
--- a/features/step_definitions/internationalization_steps.rb
+++ b/features/step_definitions/internationalization_steps.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def language_to_code(name)
   {
     'Brazilian Portuguese' => 'pt-br',
@@ -35,7 +36,7 @@ Given /^a user accessed in (.*) before$/ do |lang|
 end
 
 Given /^my browser prefers (.*)$/ do |lang|
-  header 'Accept-Language', language_to_code(lang)
+  page.driver.header 'Accept-Language', language_to_code(lang)
 end
 
 Then /^the site should be in (.*)$/ do |lang|
--
libgit2 0.21.2