4 files changed, 10 insertions, 20 deletions
diff --git a/features/project/issues/labels.feature b/features/project/issues/labels.feature
index e601a41bfc4..3c6a63ced2b 100644
--- a/features/project/issues/labels.feature
+++ b/features/project/issues/labels.feature
@@ -2,7 +2,7 @@ Feature: Project Labels
   Background:
     Given I sign in as a user
     And I own project "Shop"
-    And project "Shop" have issues tags: "bug", "feature"
+    And project "Shop" has labels: "bug", "feature", "enhancement"
     Given I visit project "Shop" labels page
 
   Scenario: I should see active milestones
diff --git a/features/steps/project/filter_labels.rb b/features/steps/project/filter_labels.rb
index 48e1108c21a..9b31a6d9da2 100644
--- a/features/steps/project/filter_labels.rb
+++ b/features/steps/project/filter_labels.rb
@@ -3,13 +3,6 @@ class ProjectFilterLabels < Spinach::FeatureSteps
   include SharedProject
   include SharedPaths
 
-  step 'project "Shop" has labels: "bug", "feature", "enhancement"' do
-    project = Project.find_by(name: "Shop")
-    create(:label, project: project, title: 'bug')
-    create(:label, project: project, title: 'feature')
-    create(:label, project: project, title: 'enhancement')
-  end
-
   step 'I should see "bug" in labels filter' do
     within ".labels-filter" do
       page.should have_content "bug"
diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb
index 73d00b0004e..6e792e94342 100644
--- a/features/steps/project/labels.rb
+++ b/features/steps/project/labels.rb
@@ -4,20 +4,14 @@ class ProjectLabels < Spinach::FeatureSteps
   include SharedPaths
 
   Then 'I should see label "bug"' do
-    within ".labels-table" do
+    within ".manage-labels-list" do
       page.should have_content "bug"
     end
   end
 
   And 'I should see label "feature"' do
-    within ".labels-table" do
+    within ".manage-labels-list" do
       page.should have_content "feature"
     end
   end
-
-  And 'project "Shop" have issues tags: "bug", "feature"' do
-    project = Project.find_by(name: "Shop")
-    label1 = create(:label, project: project, title: 'bug')
-    label2 = create(:label, project: project, title: 'feature')
-  end
 end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 1d894b33fbd..e31d349a45f 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -123,10 +123,6 @@ module SharedProject
     project.team << [user, :master]
   end
 
-  # ----------------------------------------
-  # Empty projects
-  # ----------------------------------------
-
   step 'public empty project "Empty Public Project"' do
     create :empty_project, :public, name: "Empty Public Project"
   end
@@ -135,4 +131,11 @@ module SharedProject
     project = Project.find_by(name: "Community")
     2.times { create(:note_on_issue, project: project) }
   end
+
+  step 'project "Shop" has labels: "bug", "feature", "enhancement"' do
+    project = Project.find_by(name: "Shop")
+    create(:label, project: project, title: 'bug')
+    create(:label, project: project, title: 'feature')
+    create(:label, project: project, title: 'enhancement')
+  end
 end