diff --git a/features/location.feature b/features/location.feature
index 18c84ef..523071b 100644
--- a/features/location.feature
+++ b/features/location.feature
@@ -16,13 +16,14 @@ Feature: Location
       | state    |
       | city     |
       | zip_code |
-    And I go to the Control panel
+    And I go to zezinho's control panel
     And I follow "Location"
     When I fill in "Address" with "Rua Marechal Floriano, 28"
     And I select "Brazil" from "Country"
     And I fill in "State" with "Bahia"
     And I fill in "City" with "Salvador"
-    And I fill in "ZIP Code" with "40110010"
+    And I fill in "ZIP code" with "40110010"
+    And I follow "Locate in the map"
     And I press "Save"
     Then "zezinho" should have the following data
       | address                   | country | state | city     | zip_code |
@@ -38,14 +39,14 @@ Feature: Location
     Given the following <plural>
       | identifier   | name    | owner   |
       | mycollective | My Collective | zezinho |
-    And I am on My Collective's control panel
+    And I am on mycollective's control panel
     And I follow "Location"
     And I select "Brazil" from "Country"
     And I fill in the following:
       | Address   | Rua Marechal Floriano, 28 |
       | State    | Bahia                     |
       | City     | Salvador                  |
-      | ZIP Code | 40110010                  |
+      | ZIP code | 40110010                  |
     When I press "Save"
     Then "mycollective" should have the following data
       | address                   | country | state | city     | zip_code |
--
libgit2 0.21.2