diff --git a/features/create_community.feature b/features/create_community.feature
index 66e0674..2c588e1 100644
--- a/features/create_community.feature
+++ b/features/create_community.feature
@@ -54,7 +54,8 @@ Feature: create community
     And I choose "Approve"
     When I press "Ok!"
     Then I should not see "admin_user wants to create community Community for approval"
-    When I follow "My groups"
+    When I follow "Control panel"
+    And I follow "Manage my groups"
     Then I should see "Community for approval"
 
   Scenario: environment admin rejects new community task
@@ -67,7 +68,8 @@ Feature: create community
     And I choose "Reject"
     When I press "Ok!"
     Then I should not see "admin_user wants to create community Community for approval"
-    When I follow "My groups"
+    When I follow "Control panel"
+    And I follow "Manage my groups"
     Then I should not see "Community for approval"
 
   Scenario: new community is listed after approval
@@ -75,7 +77,8 @@ Feature: create community
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
     And I approve community "Community for approval"
-    When I follow "My groups"
+    When I follow "Control panel"
+    And I follow "Manage my groups"
     Then I should see "Community for approval"
 
   Scenario: new community is not listed after rejection
@@ -83,7 +86,8 @@ Feature: create community
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
     And I reject community "Community for approval"
-    When I follow "My groups"
+    When I follow "Control panel"
+    And I follow "Manage my groups"
     Then I should not see "Community for approval"
 
   Scenario: environment admin accepts new community task but identifier was already taken
diff --git a/features/step_definitions/create_community_steps.rb b/features/step_definitions/create_community_steps.rb
index 8143a51..0f06e06 100644
--- a/features/step_definitions/create_community_steps.rb
+++ b/features/step_definitions/create_community_steps.rb
@@ -1,5 +1,6 @@
 Given /^I create community "(.+)"$/ do |community|
-  click_link('My groups')
+  click_link('Control panel')
+  click_link('Manage my groups')
   click_link('Create a new community')
   fill_in("Name", :with => community)
   click_button("Create")
--
libgit2 0.21.2